From 6d5420b09b3cddb3fe31659695ef1bebcaeb0f94 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Thu, 8 Jan 2026 18:40:18 +0200 Subject: [PATCH] Add boost_test_jamfile to CMakeLists.txt --- test/CMakeLists.txt | 72 ++------------------------------------------- test/Jamfile.v2 | 19 ++++-------- 2 files changed, 8 insertions(+), 83 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index ac40240..2cfb74c 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -11,97 +11,29 @@ endif() set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) +boost_test_jamfile(FILE Jamfile.v2 LINK_LIBRARIES Boost::uuid Boost::core Boost::container_hash Boost::lexical_cast Boost::predef Boost::array) + set(BOOST_TEST_LINK_LIBRARIES Boost::uuid Boost::core) -boost_test(TYPE run SOURCES test_uuid.cpp LINK_LIBRARIES Boost::container_hash) boost_test(TYPE run SOURCES test_uuid.cpp LINK_LIBRARIES Boost::container_hash COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 NAME test_uuid_no_simd) -boost_test(TYPE run SOURCES test_uuid_2.cpp) -boost_test(TYPE run SOURCES test_uuid_3.cpp) -boost_test(TYPE run SOURCES test_alignment.cpp) -boost_test(TYPE run SOURCES test_alignment_2.cpp) -boost_test(TYPE run SOURCES test_attribute_packed.cpp) -boost_test(TYPE run SOURCES test_pragma_pack.cpp) -boost_test(TYPE run SOURCES test_data.cpp) - -boost_test(TYPE run SOURCES test_comparison.cpp) boost_test(TYPE run SOURCES test_comparison.cpp COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 NAME test_comparison_no_simd) -boost_test(TYPE run SOURCES test_include1.cpp test_include2.cpp) - -boost_test(TYPE run SOURCES test_io.cpp LINK_LIBRARIES Boost::lexical_cast Boost::predef) boost_test(TYPE run SOURCES test_io.cpp LINK_LIBRARIES Boost::lexical_cast Boost::predef COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 NAME test_io_no_simd) -boost_test(TYPE run SOURCES test_io_2.cpp) boost_test(TYPE run SOURCES test_io_2.cpp COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 NAME test_io_2_no_simd) -boost_test(TYPE run SOURCES test_to_chars.cpp) boost_test(TYPE run SOURCES test_to_chars.cpp COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 NAME test_to_chars_no_simd) -boost_test(TYPE run SOURCES test_to_chars_2.cpp) boost_test(TYPE run SOURCES test_to_chars_2.cpp COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 NAME test_to_chars_2_no_simd) -boost_test(TYPE run SOURCES test_from_chars.cpp) boost_test(TYPE run SOURCES test_from_chars.cpp COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 NAME test_from_chars_no_simd) -boost_test(TYPE run SOURCES test_from_chars_2.cpp) boost_test(TYPE run SOURCES test_from_chars_2.cpp COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 NAME test_from_chars_2_no_simd) -boost_test(TYPE run SOURCES test_uuid_from_string.cpp) - -boost_test(TYPE run SOURCES test_uuid_clock.cpp) - -boost_test(TYPE run SOURCES test_nil_generator.cpp) -boost_test(TYPE run SOURCES test_string_generator.cpp) boost_test(TYPE run SOURCES test_random_generator.cpp LINK_LIBRARIES Boost::random Boost::predef Boost::move) -boost_test(TYPE run SOURCES test_random_generator_2.cpp) -boost_test(TYPE run SOURCES test_name_generator.cpp LINK_LIBRARIES Boost::predef) -boost_test(TYPE run SOURCES test_namespaces.cpp) -boost_test(TYPE run SOURCES test_name_generator_md5.cpp) -boost_test(TYPE run SOURCES test_name_generator_sha1.cpp) - -boost_test(TYPE run SOURCES test_time_generator.cpp) - -boost_test(TYPE run SOURCES test_time_generator_v1.cpp) -boost_test(TYPE run SOURCES test_time_generator_v1_2.cpp) boost_test(TYPE run SOURCES test_time_generator_v1_3.cpp LINK_LIBRARIES Threads::Threads) -boost_test(TYPE run SOURCES test_time_generator_v6.cpp) -boost_test(TYPE run SOURCES test_time_generator_v6_2.cpp) boost_test(TYPE run SOURCES test_time_generator_v6_3.cpp LINK_LIBRARIES Threads::Threads) -boost_test(TYPE run SOURCES test_time_generator_v7.cpp) -boost_test(TYPE run SOURCES test_time_generator_v7_2.cpp) -boost_test(TYPE run SOURCES test_time_generator_v7_3.cpp) - -boost_test(TYPE run SOURCES test_tagging.cpp) - -boost_test(TYPE run SOURCES test_uuid_class.cpp) -boost_test(TYPE run SOURCES test_uuid_in_map.cpp) - -boost_test(TYPE run SOURCES test_hash.cpp LINK_LIBRARIES Boost::container_hash) -boost_test(TYPE run SOURCES test_hash_value.cpp) boost_test(TYPE run SOURCES test_boost_unordered.cpp LINK_LIBRARIES Boost::unordered) -boost_test(TYPE run SOURCES test_std_unordered.cpp) - -boost_test(TYPE run SOURCES test_detail_md5.cpp) -boost_test(TYPE run SOURCES test_detail_sha1.cpp) -boost_test(TYPE run SOURCES test_detail_endian.cpp) -boost_test(TYPE run SOURCES test_detail_chacha20.cpp) - -boost_test(TYPE run SOURCES test_entropy_error.cpp) - -boost_test(TYPE run SOURCES test_detail_random_provider.cpp LINK_LIBRARIES Boost::array) boost_test(TYPE run SOURCES test_serialization.cpp LINK_LIBRARIES Boost::serialization) - -boost_test(TYPE run SOURCES test_constants.cpp) - -boost_test(TYPE compile SOURCES test_uuid_cx.cpp) -boost_test(TYPE run SOURCES test_string_generator_cx.cpp) -boost_test(TYPE run SOURCES test_constants_cx.cpp) - -boost_test(TYPE run SOURCES test_to_chars_cx.cpp LINK_LIBRARIES Boost::array) - -boost_test(TYPE run SOURCES test_from_chars_cx.cpp) -boost_test(TYPE run SOURCES test_from_chars_cx2.cpp) - -boost_test(TYPE run SOURCES quick.cpp) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 23109a5..bfceb96 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -97,8 +97,7 @@ run test_comparison.cpp : : : BOOST_UUID_NO_SIMD : test_comparison_no_si run test_io.cpp : : : /boost/lexical_cast//boost_lexical_cast /boost/predef//boost_predef -$(WERROR) ; -run test_io.cpp - : : : /boost/lexical_cast//boost_lexical_cast /boost/predef//boost_predef BOOST_UUID_NO_SIMD -$(WERROR) : test_io_no_simd ; +run test_io.cpp : : : /boost/lexical_cast//boost_lexical_cast /boost/predef//boost_predef BOOST_UUID_NO_SIMD -$(WERROR) : test_io_no_simd ; run test_io_2.cpp ; run test_io_2.cpp : : : BOOST_UUID_NO_SIMD : test_io_2_no_simd ; @@ -126,8 +125,7 @@ run test_nil_generator.cpp ; run test_string_generator.cpp ; run test_string_generator_2.cpp ; -run test_random_generator.cpp - : : : /boost/random//boost_random /boost/predef//boost_predef ; +run test_random_generator.cpp : : : /boost/random//boost_random /boost/predef//boost_predef ; run test_random_generator_2.cpp ; run test_name_generator.cpp @@ -150,8 +148,7 @@ run test_time_generator_v1_2.cpp : : : gcc:atomic clang-linux:atomic gcc-4.8,32:no ; -run test_time_generator_v1_3.cpp - : : : multi +run test_time_generator_v1_3.cpp : : : multi gcc:atomic clang-linux:atomic gcc-4.8,32:no ; @@ -163,8 +160,7 @@ run test_time_generator_v6_2.cpp : : : gcc:atomic clang-linux:atomic gcc-4.8,32:no ; -run test_time_generator_v6_3.cpp - : : : multi +run test_time_generator_v6_3.cpp : : : multi gcc:atomic clang-linux:atomic gcc-4.8,32:no ; @@ -174,9 +170,7 @@ run test_time_generator_v7_3.cpp ; # test serializing uuids -run test_serialization.cpp - : : : /boost/serialization//boost_serialization norecover:static -$(WERROR) ; - +run test_serialization.cpp : : : /boost/serialization//boost_serialization norecover:static -$(WERROR) ; # run test_wserialization.cpp /boost/serialization//boost_serialization /boost/serialization//boost_wserialization ; # test tagging an object @@ -195,8 +189,7 @@ run test_hash.cpp run test_hash_value.cpp ; run test_std_unordered.cpp ; -run test_boost_unordered.cpp - : : : gcc-4.7:no /boost/unordered//boost_unordered ; +run test_boost_unordered.cpp : : : gcc-4.7:no /boost/unordered//boost_unordered ; # test detail components