diff --git a/tests/Boost_Tests/BoostTestApprovalTestsTests.cpp b/tests/Boost_Tests/BoostTestApprovalTestsTests.cpp index 3ebc6165..dfbf8b2d 100644 --- a/tests/Boost_Tests/BoostTestApprovalTestsTests.cpp +++ b/tests/Boost_Tests/BoostTestApprovalTestsTests.cpp @@ -1,8 +1,7 @@ -#ifndef __CYGWIN__ -// Workaround for boost crash on cygwin: see #120 +#include "main.cpp" -#define BOOST_TEST_INCLUDED -#include +//#define BOOST_TEST_INCLUDED +//#include #include "ApprovalTests/namers/ApprovalTestNamer.h" #include "ApprovalTests/Approvals.h" @@ -23,4 +22,3 @@ BOOST_AUTO_TEST_CASE(TestCaseName) BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END() -#endif diff --git a/tests/Boost_Tests/CMakeLists.txt b/tests/Boost_Tests/CMakeLists.txt index 2f852a62..cadce0ac 100644 --- a/tests/Boost_Tests/CMakeLists.txt +++ b/tests/Boost_Tests/CMakeLists.txt @@ -5,7 +5,7 @@ endif () project(Boost_Tests) set(CMAKE_CXX_STANDARD 11) add_executable(${PROJECT_NAME} - main.cpp +# main.cpp BoostTestApprovalTestsTests.cpp ) diff --git a/tests/Boost_Tests/CygwinHack.h b/tests/Boost_Tests/CygwinHack.h deleted file mode 100644 index 6447b749..00000000 --- a/tests/Boost_Tests/CygwinHack.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifdef __CYGWIN__ -// Workaround for boost crash on cygwin: see #120 - -BOOST_AUTO_TEST_SUITE(SuiteName) -BOOST_AUTO_TEST_CASE(TestCaseName) -{ - BOOST_CHECK(true); -} - -BOOST_AUTO_TEST_SUITE_END() -#endif diff --git a/tests/Boost_Tests/main.cpp b/tests/Boost_Tests/main.cpp index 15871b27..3aa1ab04 100644 --- a/tests/Boost_Tests/main.cpp +++ b/tests/Boost_Tests/main.cpp @@ -10,6 +10,3 @@ #define APPROVALS_BOOSTTEST #include "ApprovalTests.hpp" // end-snippet - -// Workaround for boost crash on cygwin: see #120 -#include "CygwinHack.h"