Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
c4f94791
Commit
c4f94791
authored
Apr 21, 2019
by
Nicolas Carion
Browse files
some fixes in tests
parent
bd22dce8
Pipeline
#2620
passed with stage
in 21 minutes and 7 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
tests/CMakeLists.txt
View file @
c4f94791
...
...
@@ -7,6 +7,7 @@ string (REPLACE "-std=gnu++11" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
SET
(
Tests_SRCS
tests/TestMain.cpp
tests/abortutil.cpp
tests/compositiontest.cpp
tests/effectstest.cpp
tests/groupstest.cpp
...
...
@@ -17,8 +18,8 @@ SET(Tests_SRCS
tests/snaptest.cpp
tests/test_utils.cpp
tests/timewarptest.cpp
tests/trimmingtest.cpp
tests/treetest.cpp
tests/trimmingtest.cpp
PARENT_SCOPE
)
...
...
tests/abortutil.cpp
0 → 100644
View file @
c4f94791
#include "abortutil.hpp"
#ifdef __linux__
void
Disable_Console_Output
()
{
// close C file descriptors
fclose
(
stdout
);
fclose
(
stderr
);
}
#endif
tests/abortutil.hpp
View file @
c4f94791
...
...
@@ -44,12 +44,7 @@ template <class F, class... ArgTypes> decltype(auto) invoke(F &&f, ArgTypes &&..
}
}
// namespace util
void
Disable_Console_Output
()
{
// close C file descriptors
fclose
(
stdout
);
fclose
(
stderr
);
}
void
Disable_Console_Output
();
template
<
class
F
,
class
...
Args
>
bool
ABORTS
(
F
&&
f
,
Args
&&
...
args
)
{
...
...
@@ -85,7 +80,7 @@ template <class F, class... Args> bool ABORTS(F &&f, Args &&... args)
}
}
return
true
;
return
aborted
;
}
#else
template
<
class
F
,
class
...
Args
>
bool
ABORTS
(
F
&&
,
Args
&&
...)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment