diff --git a/src/Makefile.test.include b/src/Makefile.test.include --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -76,8 +76,8 @@ BITCOIN_TEST_SUITE = \ avalanche/test/util.cpp \ + test/fixture.cpp \ test/jsonutil.cpp \ - test/main.cpp \ test/scriptflags.cpp \ test/sigutil.cpp \ $(TEST_UTIL_H) diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -84,8 +84,8 @@ endif() add_boost_unit_tests_to_suite(bitcoin test_bitcoin + fixture.cpp jsonutil.cpp - main.cpp scriptflags.cpp sigutil.cpp diff --git a/src/test/main.cpp b/src/test/fixture.cpp rename from src/test/main.cpp rename to src/test/fixture.cpp --- a/src/test/main.cpp +++ b/src/test/fixture.cpp @@ -10,7 +10,7 @@ namespace utf = boost::unit_test::framework; -/* +/** * Global fixture for passing custom arguments, and clearing them all after each * test case. */ @@ -43,4 +43,4 @@ ~CustomArgumentsFixture(){}; }; -BOOST_GLOBAL_FIXTURE(CustomArgumentsFixture); +BOOST_TEST_GLOBAL_FIXTURE(CustomArgumentsFixture);