Commit c4f94791 authored by Nicolas Carion's avatar Nicolas Carion

some fixes in tests

parent bd22dce8
...@@ -7,6 +7,7 @@ string (REPLACE "-std=gnu++11" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) ...@@ -7,6 +7,7 @@ string (REPLACE "-std=gnu++11" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
SET(Tests_SRCS SET(Tests_SRCS
tests/TestMain.cpp tests/TestMain.cpp
tests/abortutil.cpp
tests/compositiontest.cpp tests/compositiontest.cpp
tests/effectstest.cpp tests/effectstest.cpp
tests/groupstest.cpp tests/groupstest.cpp
...@@ -17,8 +18,8 @@ SET(Tests_SRCS ...@@ -17,8 +18,8 @@ SET(Tests_SRCS
tests/snaptest.cpp tests/snaptest.cpp
tests/test_utils.cpp tests/test_utils.cpp
tests/timewarptest.cpp tests/timewarptest.cpp
tests/trimmingtest.cpp
tests/treetest.cpp tests/treetest.cpp
tests/trimmingtest.cpp
PARENT_SCOPE PARENT_SCOPE
) )
......
#include "abortutil.hpp"
#ifdef __linux__
void Disable_Console_Output()
{
// close C file descriptors
fclose(stdout);
fclose(stderr);
}
#endif
...@@ -44,12 +44,7 @@ template <class F, class... ArgTypes> decltype(auto) invoke(F &&f, ArgTypes &&.. ...@@ -44,12 +44,7 @@ template <class F, class... ArgTypes> decltype(auto) invoke(F &&f, ArgTypes &&..
} }
} // namespace util } // namespace util
void Disable_Console_Output() void Disable_Console_Output();
{
// close C file descriptors
fclose(stdout);
fclose(stderr);
}
template <class F, class... Args> bool ABORTS(F &&f, Args &&... args) 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) ...@@ -85,7 +80,7 @@ template <class F, class... Args> bool ABORTS(F &&f, Args &&... args)
} }
} }
return true; return aborted;
} }
#else #else
template <class F, class... Args> bool ABORTS(F &&, Args &&...) template <class F, class... Args> bool ABORTS(F &&, Args &&...)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment