Hi there,
I was trying to run tests in the CMake-ified boost, and found that many
tests fail even to configure.
Often what happens is that shared-build test requests a component that
is only build statically. These seem relatively easy, if tedious to
fix--you just have to construct the name of full dependency, with
explicit -static- or -shared- marker. I added in an include file that
contains this logic for boost_test_exec_monitor, because many modules
request that.
After fixing all these, another issue came up: in some modules,
e.g. phoenix, the list of tests only includes directories, and
boost_test_run is then run with the directory as an argument, which
fails at config time. These are less straightforward to fix. I can
expand this into list of files easily enough. But some tests are
compile only, some should be run, some are expected to pass, others to
fail, and it's not immediately clear which are which. Then there are
test monitors, and presumably some tests will define functions like
cpp_main instead of mere main, and these should be linked with the
monitor library... I _think_ I fixed phoenix, but it's hard to tell,
because I didn't get clean config, and therefore didn't attempt to run
anything. It should at least be less broken. I gave up after phoenix.
Hmm, so, is this a known thing? Perhaps I'm just missing some magic
that makes it all work. I know cmake boost is in a lot of flux, so
chances are this area just needs some work.
(I'll attach a patch. I can form the same as git pull request if that's
preferred.)
Thanks,
PM
diff -urp boost_1_48_0/libs/chrono/test/CMakeLists.txt boost_1_48_0.pm/libs/chrono/test/CMakeLists.txt
--- boost_1_48_0/libs/chrono/test/CMakeLists.txt 2012-01-16 20:26:38.516583702 +0100
+++ boost_1_48_0.pm/libs/chrono/test/CMakeLists.txt 2012-01-16 21:17:57.048653852 +0100
@@ -6,28 +6,19 @@ boost_additional_test_dependencies(chron
set (CHRONO_LIBRARIES
boost_chrono
- boost_test_exec_monitor)
+ test_exec_monitor)
-set (BOOST_TEST_EXEC_MONITOR_SUFFIX "")
-if (NOT BUILD_SINGLE_THREADED)
- set (BOOST_TEST_EXEC_MONITOR_SUFFIX "-mt")
-endif (NOT BUILD_SINGLE_THREADED)
-
-set (BOOST_TEST_EXEC_MONITOR_SUFFIX "${BOOST_TEST_EXEC_MONITOR_SUFFIX}-static")
-if (NOT BUILD_RELEASE)
- set (BOOST_TEST_EXEC_MONITOR_SUFFIX "${BOOST_TEST_EXEC_MONITOR_SUFFIX}-debug")
-endif (NOT BUILD_RELEASE)
+include("${CMAKE_SOURCE_DIR}/libs/test/depend.cmake")
#
macro (chrono_test_run TESTNAME)
boost_test_run (${TESTNAME}
STATIC
- DEPENDS boost_chrono boost_test_exec_monitor )
+ DEPENDS boost_chrono ${DEP_BOOST_TEST_EXEC_MONITOR})
boost_test_run ("${TESTNAME}_dll"
${TESTNAME}.cpp
SHARED
- DEPENDS boost_chrono
- "boost_test_exec_monitor${BOOST_TEST_EXEC_MONITOR_SUFFIX}")
+ DEPENDS boost_chrono ${DEP_BOOST_TEST_EXEC_MONITOR})
endmacro (chrono_test_run)
#
diff -urp boost_1_48_0/libs/config/test/CMakeLists.txt boost_1_48_0.pm/libs/config/test/CMakeLists.txt
--- boost_1_48_0/libs/config/test/CMakeLists.txt 2012-01-16 20:26:38.520583702 +0100
+++ boost_1_48_0.pm/libs/config/test/CMakeLists.txt 2012-01-16 21:12:56.024647076 +0100
@@ -28,10 +28,11 @@ boost_test_run(config_info
boost_test_run(math_info
EXTRA_OPTIONS ${BOOST_CONFIG_BORLAND_STATIC_OPTIONS})
+include("${CMAKE_SOURCE_DIR}/libs/test/depend.cmake")
-boost_test_run(limits_test DEPENDS boost_test_exec_monitor)
+boost_test_run(limits_test DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
boost_test_run(abi_test abi/abi_test.cpp abi/main.cpp)
# TODO: config_link_test
boost_test_compile_fail(test_thread_fail1 threads/test_thread_fail1.cpp)
-boost_test_compile_fail(test_thread_fail2 threads/test_thread_fail2.cpp)
\ No newline at end of file
+boost_test_compile_fail(test_thread_fail2 threads/test_thread_fail2.cpp)
diff -urp boost_1_48_0/libs/flyweight/test/CMakeLists.txt boost_1_48_0.pm/libs/flyweight/test/CMakeLists.txt
--- boost_1_48_0/libs/flyweight/test/CMakeLists.txt 2012-01-16 20:26:38.532583702 +0100
+++ boost_1_48_0.pm/libs/flyweight/test/CMakeLists.txt 2012-01-16 19:47:31.432530151 +0100
@@ -46,8 +46,17 @@ boost_add_library(intermod_holder_dll
NO_INSTALL
)
+set(BOOST_INTERMOD_HOLDER_SUFFIX "")
+if (NOT BUILD_SINGLE_THREADED)
+ set(BOOST_INTERMOD_HOLDER_SUFFIX "-mt")
+endif()
+set(BOOST_INTERMOD_HOLDER_SUFFIX "${BOOST_INTERMOD_HOLDER_SUFFIX}-shared")
+if (NOT BUILD_RELEASE)
+ set(BOOST_INTERMOD_HOLDER_SUFFIX "${BOOST_INTERMOD_HOLDER_SUFFIX}-debug")
+endif()
+
boost_test_run(intermod_holder
test_intermod_holder.cpp test_intermod_holder_main.cpp
LINK_LIBS ${CMAKE_THREAD_LIBS_INIT}
- DEPENDS intermod_holder_dll)
+ DEPENDS "boost_intermod_holder_dll${BOOST_INTERMOD_HOLDER_SUFFIX}")
diff -urp boost_1_48_0/libs/format/test/CMakeLists.txt boost_1_48_0.pm/libs/format/test/CMakeLists.txt
--- boost_1_48_0/libs/format/test/CMakeLists.txt 2012-01-16 20:26:38.534583702 +0100
+++ boost_1_48_0.pm/libs/format/test/CMakeLists.txt 2012-01-16 21:11:47.422645503 +0100
@@ -6,8 +6,10 @@
#
boost_additional_test_dependencies(format BOOST_DEPENDS test)
-boost_test_run(format_test1 DEPENDS boost_test_exec_monitor)
-boost_test_run(format_test2 DEPENDS boost_test_exec_monitor)
-boost_test_run(format_test3 DEPENDS boost_test_exec_monitor)
-boost_test_run(format_test_wstring DEPENDS boost_test_exec_monitor)
+include("${CMAKE_SOURCE_DIR}/libs/test/depend.cmake")
+
+boost_test_run(format_test1 DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(format_test2 DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(format_test3 DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(format_test_wstring DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
diff -urp boost_1_48_0/libs/graph/test/CMakeLists.txt boost_1_48_0.pm/libs/graph/test/CMakeLists.txt
--- boost_1_48_0/libs/graph/test/CMakeLists.txt 2012-01-16 20:26:38.545583702 +0100
+++ boost_1_48_0.pm/libs/graph/test/CMakeLists.txt 2012-01-16 21:17:05.352652768 +0100
@@ -6,6 +6,18 @@
boost_additional_test_dependencies(graph BOOST_DEPENDS test assign)
+include("${CMAKE_SOURCE_DIR}/libs/test/depend.cmake")
+
+set (BOOST_LOCALE_MT_SUFFIX "")
+if (NOT BUILD_SINGLE_THREADED)
+ set (BOOST_LOCALE_MT_SUFFIX "-mt")
+endif (NOT BUILD_SINGLE_THREADED)
+set (BOOST_GRAPH_SUFFIX "${BOOST_LOCALE_MT_SUFFIX}-shared")
+if (NOT BUILD_RELEASE)
+ set (BOOST_GRAPH_SUFFIX "${BOOST_GRAPH_SUFFIX}-debug")
+endif (NOT BUILD_RELEASE)
+
+
boost_test_run(transitive_closure_test)
boost_test_compile(adj_list_cc)
boost_test_run(adj_list_edge_list_set)
@@ -28,7 +40,8 @@ boost_test_run(generator_test)
boost_test_run(graph)
boost_test_compile(graph_concepts)
boost_test_run(graphviz_test
- DEPENDS boost_test_exec_monitor boost_graph STATIC)
+ STATIC
+ DEPENDS "boost_graph${BOOST_GRAPH_SUFFIX}" ${DEP_BOOST_TEST_EXEC_MONITOR})
boost_test_run(gursoy_atun_layout_test)
boost_test_run(layout_test)
boost_test_run(serialize DEPENDS boost_serialization)
diff -urp boost_1_48_0/libs/integer/test/CMakeLists.txt boost_1_48_0.pm/libs/integer/test/CMakeLists.txt
--- boost_1_48_0/libs/integer/test/CMakeLists.txt 2012-01-16 20:26:38.549583702 +0100
+++ boost_1_48_0.pm/libs/integer/test/CMakeLists.txt 2012-01-16 21:13:44.231648116 +0100
@@ -6,9 +6,16 @@
#
boost_additional_test_dependencies(integer BOOST_DEPENDS test)
+include("${CMAKE_SOURCE_DIR}/libs/test/depend.cmake")
+
boost_test_run(cstdint_test cstdint_test.cpp)
-boost_test_run(integer_mask_test integer_mask_test.cpp DEPENDS boost_test_exec_monitor)
-boost_test_run(integer_test integer_test.cpp DEPENDS boost_test_exec_monitor)
-boost_test_run(integer_traits_test integer_traits_test.cpp DEPENDS boost_test_exec_monitor)
-boost_test_run(static_log2_test static_log2_test.cpp DEPENDS boost_test_exec_monitor)
-boost_test_run(static_min_max_test static_min_max_test.cpp DEPENDS boost_test_exec_monitor)
+boost_test_run(integer_mask_test integer_mask_test.cpp
+ DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(integer_test integer_test.cpp
+ DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(integer_traits_test integer_traits_test.cpp
+ DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(static_log2_test static_log2_test.cpp
+ DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(static_min_max_test static_min_max_test.cpp
+ DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
diff -urp boost_1_48_0/libs/io/test/CMakeLists.txt boost_1_48_0.pm/libs/io/test/CMakeLists.txt
--- boost_1_48_0/libs/io/test/CMakeLists.txt 2012-01-16 20:26:38.552583702 +0100
+++ boost_1_48_0.pm/libs/io/test/CMakeLists.txt 2012-01-16 21:17:25.351653197 +0100
@@ -6,7 +6,8 @@
#
boost_additional_test_dependencies(io BOOST_DEPENDS test)
+include("${CMAKE_SOURCE_DIR}/libs/test/depend.cmake")
boost_test_run(ios_state_unit_test DEPENDS boost_unit_test_framework)
-boost_test_run(ios_state_test DEPENDS boost_test_exec_monitor)
+boost_test_run(ios_state_test DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
diff -urp boost_1_48_0/libs/lambda/test/CMakeLists.txt boost_1_48_0.pm/libs/lambda/test/CMakeLists.txt
--- boost_1_48_0/libs/lambda/test/CMakeLists.txt 2012-01-16 20:26:38.557583702 +0100
+++ boost_1_48_0.pm/libs/lambda/test/CMakeLists.txt 2012-01-16 21:19:47.063656407 +0100
@@ -6,19 +6,22 @@
#
boost_additional_test_dependencies(lambda BOOST_DEPENDS test any)
-boost_test_run(algorithm_test DEPENDS boost_test_exec_monitor)
-boost_test_run(bind_tests_simple DEPENDS boost_test_exec_monitor)
-boost_test_run(bind_tests_advanced DEPENDS boost_test_exec_monitor)
-boost_test_run(bind_tests_simple_f_refs DEPENDS boost_test_exec_monitor)
-boost_test_run(bll_and_function DEPENDS boost_test_exec_monitor)
-boost_test_run(lambda_cast_test
- cast_test.cpp DEPENDS boost_test_exec_monitor)
-boost_test_run(constructor_tests DEPENDS boost_test_exec_monitor)
-boost_test_run(control_structures DEPENDS boost_test_exec_monitor)
-boost_test_run(exception_test DEPENDS boost_test_exec_monitor)
-boost_test_run(extending_rt_traits DEPENDS boost_test_exec_monitor)
-boost_test_run(is_instance_of_test DEPENDS boost_test_exec_monitor)
-boost_test_run(member_pointer_test DEPENDS boost_test_exec_monitor)
-boost_test_run(operator_tests_simple DEPENDS boost_test_exec_monitor)
-boost_test_run(phoenix_control_structures DEPENDS boost_test_exec_monitor)
-boost_test_run(switch_construct DEPENDS boost_test_exec_monitor)
+include("${CMAKE_SOURCE_DIR}/libs/test/depend.cmake")
+
+boost_test_run(algorithm_test DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(bind_tests_simple DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(bind_tests_advanced DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(bind_tests_simple_f_refs DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(bll_and_function DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(lambda_cast_test cast_test.cpp
+ DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(constructor_tests DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(control_structures DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(exception_test DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(extending_rt_traits DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(is_instance_of_test DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(member_pointer_test DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(operator_tests_simple DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(phoenix_control_structures
+ DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(switch_construct DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
diff -urp boost_1_48_0/libs/locale/test/CMakeLists.txt boost_1_48_0.pm/libs/locale/test/CMakeLists.txt
--- boost_1_48_0/libs/locale/test/CMakeLists.txt 2012-01-16 20:26:38.558583702 +0100
+++ boost_1_48_0.pm/libs/locale/test/CMakeLists.txt 2012-01-16 22:17:06.432734938 +0100
@@ -6,55 +6,64 @@ boost_additional_test_dependencies (loca
set (LOCALE_LIBRARIES
boost_locale
- boost_test_exec_monitor)
+ test_exec_monitor)
-set (BOOST_TEST_EXEC_MONITOR_SUFFIX "")
+include("${CMAKE_SOURCE_DIR}/libs/test/depend.cmake")
+
+set (BOOST_LOCALE_MT_SUFFIX "")
if (NOT BUILD_SINGLE_THREADED)
- set (BOOST_TEST_EXEC_MONITOR_SUFFIX "-mt")
+ set (BOOST_LOCALE_MT_SUFFIX "-mt")
endif (NOT BUILD_SINGLE_THREADED)
-
-set (BOOST_TEST_EXEC_MONITOR_SUFFIX "${BOOST_TEST_EXEC_MONITOR_SUFFIX}-static")
+set (BOOST_LOCALE_STATIC_SUFFIX "${BOOST_LOCALE_MT_SUFFIX}-static")
+set (BOOST_LOCALE_SHARED_SUFFIX "${BOOST_LOCALE_MT_SUFFIX}-shared")
if (NOT BUILD_RELEASE)
- set (BOOST_TEST_EXEC_MONITOR_SUFFIX "${BOOST_TEST_EXEC_MONITOR_SUFFIX}-debug")
+ set (BOOST_LOCALE_SHARED_SUFFIX "${BOOST_LOCALE_SHARED_SUFFIX}-debug")
+ set (BOOST_LOCALE_STATIC_SUFFIX "${BOOST_LOCALE_STATIC_SUFFIX}-debug")
endif (NOT BUILD_RELEASE)
#
macro (locale_test_run TESTNAME)
- boost_test_run (${TESTNAME}
- STATIC
- DEPENDS boost_locale boost_test_exec_monitor )
+ if (NO_STATIC_IF_ICU_FOUND)
+ boost_test_run (${TESTNAME}
+ STATIC
+ DEPENDS
+ "boost_locale${BOOST_LOCALE_STATIC_SUFFIX}"
+ ${DEP_BOOST_TEST_EXEC_MONITOR})
+ endif (NO_STATIC_IF_ICU_FOUND)
+
boost_test_run ("${TESTNAME}_dll"
${TESTNAME}.cpp
SHARED
- DEPENDS boost_locale
- "boost_test_exec_monitor${BOOST_TEST_EXEC_MONITOR_SUFFIX}")
+ DEPENDS
+ "boost_locale${BOOST_LOCALE_SHARED_SUFFIX}" ${DEP_BOOST_TEST_EXEC_MONITOR})
endmacro (locale_test_run)
#
set (TESTS
- test_config.cpp
- test_utf.cpp
- test_date_time.cpp
- test_ios_prop.cpp
- test_codepage_converter.cpp
- test_codepage.cpp
- test_message.cpp
- test_generator.cpp
- test_collate.cpp
- test_convert.cpp
- test_boundary.cpp
- test_formatting.cpp
- test_icu_vs_os_timezone.cpp
- test_winapi_collate.cpp
- test_winapi_convert.cpp
- test_winapi_formatting.cpp
- test_posix_collate.cpp
- test_posix_convert.cpp
- test_posix_formatting.cpp
- test_std_collate.cpp
- test_std_convert.cpp
- test_std_formatting.cpp
+ test_config
+ test_utf
+ test_date_time
+ test_ios_prop
+ test_codepage_converter
+ test_codepage
+ test_message
+ test_generator
+ test_collate
+ test_convert
+ test_boundary
+ test_formatting
+ test_icu_vs_os_timezone
+ test_winapi_collate
+ test_winapi_convert
+ test_winapi_formatting
+ test_posix_collate
+ test_posix_convert
+ test_posix_formatting
+ test_std_collate
+ test_std_convert
+ test_std_formatting
)
-#
-locale_test_(run_timer_test)
+foreach (_test ${TESTS})
+ locale_test_run (${_test})
+endforeach (_test ${TESTS})
diff -urp boost_1_48_0/libs/math/test/CMakeLists.txt boost_1_48_0.pm/libs/math/test/CMakeLists.txt
--- boost_1_48_0/libs/math/test/CMakeLists.txt 2012-01-16 20:26:38.561583702 +0100
+++ boost_1_48_0.pm/libs/math/test/CMakeLists.txt 2012-01-16 21:18:20.016654473 +0100
@@ -7,6 +7,8 @@
boost_additional_test_dependencies(math BOOST_DEPENDS test regex)
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include("${CMAKE_SOURCE_DIR}/libs/test/depend.cmake")
+
boost_test_run(common_factor_test DEPENDS boost_unit_test_framework)
boost_test_run(octonion_test
../octonion/octonion_test.cpp
@@ -28,6 +30,6 @@ foreach(mathtest
hypot_test
)
- boost_test_run(${mathtest} DEPENDS boost_test_exec_monitor)
+ boost_test_run(${mathtest} DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
endforeach()
diff -urp boost_1_48_0/libs/move/test/CMakeLists.txt boost_1_48_0.pm/libs/move/test/CMakeLists.txt
--- boost_1_48_0/libs/move/test/CMakeLists.txt 2012-01-16 20:26:38.562583702 +0100
+++ boost_1_48_0.pm/libs/move/test/CMakeLists.txt 2012-01-16 22:11:08.207726759 +0100
@@ -6,17 +6,18 @@ boost_additional_test_dependencies (move
#
set (TESTS
- doc_clone_ptr
- doc_construct_forward
- doc_file_descriptor
- doc_how_works
- doc_move_algorithms
- doc_move_inserter
- doc_move_iterator
+ back_move_inserter
+ construct_forward
+ conversion_test
+ copy_elision_test
+ copy_move_optimization
+ move
+ move_algorithm
+ move_iterator
)
foreach (_test ${TESTS})
- boost_test_run (${_test} DEPENDS boost_unit_test_framework)
+ boost_test_run (${_test} ${_test}.cpp DEPENDS boost_unit_test_framework)
endforeach (_test ${TESTS})
if (WIN32)
diff -urp boost_1_48_0/libs/multi_array/test/CMakeLists.txt boost_1_48_0.pm/libs/multi_array/test/CMakeLists.txt
--- boost_1_48_0/libs/multi_array/test/CMakeLists.txt 2012-01-16 20:26:38.568583702 +0100
+++ boost_1_48_0.pm/libs/multi_array/test/CMakeLists.txt 2012-01-16 21:19:05.431655516 +0100
@@ -30,18 +30,21 @@ boost_test_compile_fail(fail_ref_cview)
boost_test_compile_fail(fail_ref_cview2)
boost_test_compile_fail(fail_ref_cview3)
-boost_test_run(constructors DEPENDS boost_test_exec_monitor)
-boost_test_run(access DEPENDS boost_test_exec_monitor)
-boost_test_run(compare DEPENDS boost_test_exec_monitor)
-boost_test_run(iterators DEPENDS boost_test_exec_monitor)
-boost_test_run(slice DEPENDS boost_test_exec_monitor)
-boost_test_run(assign DEPENDS boost_test_exec_monitor)
-boost_test_run(assign_to_array DEPENDS boost_test_exec_monitor)
-boost_test_run(index_bases DEPENDS boost_test_exec_monitor)
-boost_test_run(storage_order DEPENDS boost_test_exec_monitor)
-boost_test_run(reshape DEPENDS boost_test_exec_monitor)
-boost_test_run(range1 DEPENDS boost_test_exec_monitor)
-boost_test_run(idxgen1 DEPENDS boost_test_exec_monitor)
-boost_test_run(stl_interaction DEPENDS boost_test_exec_monitor)
-boost_test_run(resize DEPENDS boost_test_exec_monitor)
+include("${CMAKE_SOURCE_DIR}/libs/test/depend.cmake")
+
+boost_test_run(constructors DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(access DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(compare DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(iterators DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(slice DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(assign DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(assign_to_array DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(index_bases DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(storage_order DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(reshape DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(range1 DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(idxgen1 DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(stl_interaction DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(resize DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+
boost_test_compile(concept_checks)
diff -urp boost_1_48_0/libs/numeric/interval/test/CMakeLists.txt boost_1_48_0.pm/libs/numeric/interval/test/CMakeLists.txt
--- boost_1_48_0/libs/numeric/interval/test/CMakeLists.txt 2012-01-16 20:26:38.571583702 +0100
+++ boost_1_48_0.pm/libs/numeric/interval/test/CMakeLists.txt 2012-01-16 18:04:23.779388960 +0100
@@ -25,10 +25,10 @@ message(STATUS "numeric/interval/test/ov
boost_test_run(pi)
boost_test_run(pow)
-boost_test_run(cmp DEPENDS boost_test_exec_monitor)
-boost_test_run(cmp_exn DEPENDS boost_test_exec_monitor)
-boost_test_run(cmp_exp DEPENDS boost_test_exec_monitor)
-boost_test_run(cmp_lex DEPENDS boost_test_exec_monitor)
-boost_test_run(cmp_set DEPENDS boost_test_exec_monitor)
-boost_test_run(cmp_tribool DEPENDS boost_test_exec_monitor)
-boost_test_run(test_float DEPENDS boost_test_exec_monitor)
+boost_test_run(cmp DEPENDS test_exec_monitor)
+boost_test_run(cmp_exn DEPENDS test_exec_monitor)
+boost_test_run(cmp_exp DEPENDS test_exec_monitor)
+boost_test_run(cmp_lex DEPENDS test_exec_monitor)
+boost_test_run(cmp_set DEPENDS test_exec_monitor)
+boost_test_run(cmp_tribool DEPENDS test_exec_monitor)
+boost_test_run(test_float DEPENDS test_exec_monitor)
diff -urp boost_1_48_0/libs/phoenix/test/CMakeLists.txt boost_1_48_0.pm/libs/phoenix/test/CMakeLists.txt
--- boost_1_48_0/libs/phoenix/test/CMakeLists.txt 2012-01-16 20:26:38.575583702 +0100
+++ boost_1_48_0.pm/libs/phoenix/test/CMakeLists.txt 2012-01-16 22:09:50.184724968 +0100
@@ -30,24 +30,195 @@ IF( ${CMAKE_CXX_COMPILER} MATCHES "icpc"
#TODO// Turn off debug symbols?
ENDIF( ${CMAKE_CXX_COMPILER} MATCHES "icpc" )
-set(TESTS
-algorithm
-bll_compatibility
-bind
-boost_bind_compatibility
-container
-core
-function
-include
-object
-operator
-regression
-scope
-statement
-stdlib)
+set(RUNTIME_TESTS
+ stdlib/cmath
+ scope/dynamic_tests
+ scope/bug3289
+ scope/lambda_tests_phx2
+ scope/bug_000008
+ scope/let_tests
+ scope/lambda_tests
+ scope/this
+ regression/bug4853
+ regression/bug5626
+ regression/bug5968
+ statement/if_tests
+ statement/exceptions
+ statement/switch_tests
+ statement/loops_tests
+ operator/unary_tests
+ operator/misc_binary_tests
+ operator/if_else_tests
+ operator/io_tests
+ operator/bitwise_tests
+ operator/comparison_tests
+ operator/member
+ operator/arithmetic_tests
+ operator/logical_tests
+ operator/self_tests
+ bll_compatibility/operator_tests_simple
+ bll_compatibility/switch_construct
+ bll_compatibility/phoenix_control_structures
+ bll_compatibility/is_instance_of_test
+ bll_compatibility/extending_rt_traits
+ bll_compatibility/istreambuf_test
+ bll_compatibility/member_pointer_test
+ bll_compatibility/ret_test
+ bll_compatibility/algorithm_test
+ bll_compatibility/bll_and_function
+ bll_compatibility/exception_test
+ bll_compatibility/result_of_tests
+ bll_compatibility/rvalue_test
+ bll_compatibility/cast_test
+ bll_compatibility/bind_tests_simple
+ bll_compatibility/control_structures
+ bll_compatibility/bind_tests_advanced
+ bll_compatibility/bind_tests_simple_f_refs
+ bll_compatibility/constructor_tests
+ function/adapt_function
+ function/function_tests
+ function/function_tests_phx2
+ object/cast_tests
+ object/new_delete_tests
+ algorithm/querying
+ algorithm/transformation3
+ algorithm/transformation1
+ algorithm/transformation2
+ algorithm/transformation4
+ algorithm/querying2
+ algorithm/iteration
+ bind/bind_function_object_tests
+ bind/bind_function_tests
+ bind/bug5782
+ bind/bind_member_function_tests
+ bind/bind_member_variable_tests
+ bind/bind_function_object_tests_phx2
+ include/phoenix
+ include/version
+ include/core
+ include/object
+ include/scope/let
+ include/scope/local_variable
+ include/scope/lambda
+ include/scope/dynamic
+ include/scope/scoped_environment
+ include/scope/this
+ include/operator
+ include/fusion/at
+ include/stl
+ include/statement/sequence
+ include/statement/do_while
+ include/statement/while
+ include/statement/if
+ include/statement/try_catch
+ include/statement/throw
+ include/statement/switch
+ include/statement/for
+ include/stl/algorithm
+ include/stl/algorithm/transformation
+ include/stl/algorithm/querying
+ include/stl/algorithm/iteration
+ include/stl/container
+ include/stl/container/container
+ include/operator/self
+ include/operator/io
+ include/operator/comparison
+ include/operator/logical
+ include/operator/if_else
+ include/operator/member
+ include/operator/bitwise
+ include/operator/arithmetic
+ include/function/function
+ include/object/delete
+ include/object/new
+ include/object/construct
+ include/object/dynamic_cast
+ include/object/const_cast
+ include/object/static_cast
+ include/object/reinterpret_cast
+ include/bind/bind_member_variable
+ include/bind/bind_member_function
+ include/fusion_at
+ include/support/iterate
+ include/support/preprocessor/round
+ include/statement
+ include/fusion
+ include/bind
+ include/function
+ include/scope
+ include/core/domain
+ include/core/environment
+ include/core/expression
+ include/core/meta_grammar
+ include/core/argument
+ include/core/actor
+ include/core/visit_each
+ include/core/is_actor
+ include/core/call
+ include/core/function_equal
+ include/core/value
+ include/core/is_nullary
+ include/core/terminal
+ include/core/nothing
+ include/core/limits
+ include/core/arity
+ include/core/reference
+ boost_bind_compatibility/bind_stdcall_test
+ boost_bind_compatibility/bind_test
+ boost_bind_compatibility/bind_fnobj2_test
+ boost_bind_compatibility/bind_dm3_test
+ boost_bind_compatibility/bind_rvalue_test
+ boost_bind_compatibility/bind_dm_test
+ boost_bind_compatibility/bind_placeholder_test
+ boost_bind_compatibility/bind_visit_test
+ boost_bind_compatibility/bind_rel_test
+ boost_bind_compatibility/bind_unary_addr
+ boost_bind_compatibility/bind_eq3_test
+ boost_bind_compatibility/bind_cv_test
+ boost_bind_compatibility/bind_lookup_problem_test
+ boost_bind_compatibility/bind_fastcall_test
+ boost_bind_compatibility/bind_fastcall_mf_test
+ boost_bind_compatibility/bind_not_test
+ boost_bind_compatibility/bind_stdcall_mf_test
+ boost_bind_compatibility/bind_cdecl_mf_test
+ boost_bind_compatibility/bind_stateful_test
+ boost_bind_compatibility/bind_and_or_test
+ boost_bind_compatibility/bind_eq_test
+ boost_bind_compatibility/bind_eq2_test
+ boost_bind_compatibility/bind_rv_sp_test
+ boost_bind_compatibility/bind_function_test
+ boost_bind_compatibility/bind_mf2_test
+ boost_bind_compatibility/bind_dm2_test
+ boost_bind_compatibility/bind_fn2_test
+ boost_bind_compatibility/bind_ref_test
+ boost_bind_compatibility/bind_const_test
+ container/container_tests3a
+ container/container_tests4b
+ container/container_tests5a
+ container/container_tests1b
+ container/container_tests5b
+ container/container_tests1a
+ container/container_tests2b
+ container/container_tests6b
+ container/container_tests2a
+ container/container_tests4a
+ container/container_tests6a
+ container/container_tests3b
+ core/primitives_tests
+)
-foreach(TEST ${TESTS})
- boost_test_run(${TEST} DEPENDS boost_unit_test_framework)
+set(COMPILE_TESTS
+ include/operator/operator
+ include/bind/bind
+ include/core/test
+)
+
+foreach(TEST ${COMPILE_TESTS})
+ boost_test_compile(${TEST} "${TEST}.cpp" DEPENDS boost_unit_test_framework)
+endforeach(TEST ${TESTS})
+
+foreach(TEST ${RUNTIME_TESTS})
+ boost_test_run(${TEST} "${TEST}.cpp" DEPENDS boost_unit_test_framework)
endforeach(TEST ${TESTS})
if(WIN32)
diff -urp boost_1_48_0/libs/pool/test/CMakeLists.txt boost_1_48_0.pm/libs/pool/test/CMakeLists.txt
--- boost_1_48_0/libs/pool/test/CMakeLists.txt 2012-01-16 20:26:38.577583702 +0100
+++ boost_1_48_0.pm/libs/pool/test/CMakeLists.txt 2012-01-16 21:15:09.367650120 +0100
@@ -6,4 +6,6 @@
#
boost_additional_test_dependencies(pool BOOST_DEPENDS test)
-boost_test_run(test_pool_alloc DEPENDS boost_test_exec_monitor)
+include("${CMAKE_SOURCE_DIR}/libs/test/depend.cmake")
+
+boost_test_run(test_pool_alloc DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
diff -urp boost_1_48_0/libs/program_options/test/CMakeLists.txt boost_1_48_0.pm/libs/program_options/test/CMakeLists.txt
--- boost_1_48_0/libs/program_options/test/CMakeLists.txt 2012-01-16 20:26:38.580583702 +0100
+++ boost_1_48_0.pm/libs/program_options/test/CMakeLists.txt 2012-01-16 21:05:58.935637561 +0100
@@ -8,26 +8,18 @@ boost_additional_test_dependencies(progr
set(PROGRAM_OPTIONS_LIBRARIES
boost_program_options
- boost_test_exec_monitor)
+ test_exec_monitor)
-set(BOOST_TEST_EXEC_MONITOR_SUFFIX "")
-if (NOT BUILD_SINGLE_THREADED)
- set(BOOST_TEST_EXEC_MONITOR_SUFFIX "-mt")
-endif()
-set(BOOST_TEST_EXEC_MONITOR_SUFFIX "${BOOST_TEST_EXEC_MONITOR_SUFFIX}-static")
-if (NOT BUILD_RELEASE)
- set(BOOST_TEST_EXEC_MONITOR_SUFFIX "${BOOST_TEST_EXEC_MONITOR_SUFFIX}-debug")
-endif()
+include("${CMAKE_SOURCE_DIR}/libs/test/depend.cmake")
macro(program_options_test_run TESTNAME)
boost_test_run(${TESTNAME}
STATIC
- DEPENDS boost_program_options boost_test_exec_monitor )
+ DEPENDS boost_program_options ${DEP_BOOST_TEST_EXEC_MONITOR})
boost_test_run("${TESTNAME}_dll"
${TESTNAME}.cpp
SHARED
- DEPENDS boost_program_options
- "boost_test_exec_monitor${BOOST_TEST_EXEC_MONITOR_SUFFIX}")
+ DEPENDS boost_program_options ${DEP_BOOST_TEST_EXEC_MONITOR})
endmacro(program_options_test_run)
program_options_test_run(options_description_test)
diff -urp boost_1_48_0/libs/ratio/test/CMakeLists.txt boost_1_48_0.pm/libs/ratio/test/CMakeLists.txt
--- boost_1_48_0/libs/ratio/test/CMakeLists.txt 2012-01-16 20:26:38.590583702 +0100
+++ boost_1_48_0.pm/libs/ratio/test/CMakeLists.txt 2012-01-16 21:58:12.288709068 +0100
@@ -6,22 +6,76 @@
#
boost_additional_test_dependencies(ratio BOOST_DEPENDS test)
-#
-set(TESTS
-ratio_arithmetic
-ratio_comparison
-ratio_extensions
-ratio_io
-ratio_ratio)
+set(COMPILE_TESTS
+ ratio_comparison/ratio_less_equal_pass
+ ratio_comparison/ratio_equal_pass
+ ratio_comparison/ratio_not_equal_pass
+ ratio_comparison/ratio_less_pass
+ ratio_comparison/ratio_greater_equal_pass
+ ratio_comparison/ratio_greater_pass
+ ratio_ratio/ratio3_fail
+ ratio_ratio/ratio4_fail
+ ratio_ratio/ratio2_fail
+ ratio_ratio/ratio1_fail
+ ratio_io/ratio_io_fail
+ ratio_arithmetic/ratio_add_3_fail
+ ratio_arithmetic/ratio_add_pass
+ ratio_arithmetic/ratio_divide_pass
+ ratio_arithmetic/ratio_multiply_pass
+ ratio_arithmetic/ratio_add_2_fail
+ ratio_arithmetic/ratio_subtract_pass
+ ratio_arithmetic/ratio_subtract_fail
+ ratio_arithmetic/ratio_multiply_fail
+ ratio_arithmetic/ratio_divide_fail
+ ratio_arithmetic/ratio_add_fail
+ typedefs_pass
+ ratio_extensions/mpl_less_equal_pass
+ ratio_extensions/mpl_greater_pass
+ ratio_extensions/mpl_negate_pass
+ ratio_extensions/mpl_equal_to_pass
+ ratio_extensions/mpl_not_equal_to_pass
+ ratio_extensions/mpl_divides_pass
+ ratio_extensions/mpl_abs_pass
+ ratio_extensions/mpl_less_pass
+ ratio_extensions/mpl_greater_equal_pass
+ ratio_extensions/mpl_times_pass
+ ratio_extensions/mpl_sign_pass
+ ratio_extensions/mpl_arithmetic_pass
+ ratio_extensions/mpl_rational_constant_pass
+ ratio_extensions/mpl_plus_pass
+ ratio_extensions/mpl_comparison_pass
+ ratio_extensions/mpl_minus_pass
+)
+
+set(RUNTIME_TESTS
+ ratio_ratio/ratio_pass
+ ratio_test
+ ratio_io/ratio_io_pass
+ ratio_extensions/ratio_ext_pass
+)
+
+foreach(TEST ${COMPILE_TESTS})
+ string(REGEX MATCH "_pass$" IS_PASS ${TEST})
+ if(IS_PASS)
+ boost_test_compile(${TEST} "${TEST}.cpp"
+ DEPENDS boost_unit_test_framework)
+ else()
+ boost_test_compile_fail(${TEST} "${TEST}.cpp"
+ DEPENDS boost_unit_test_framework)
+ endif()
+endforeach(TEST ${TESTS})
-foreach(TEST ${TESTS})
- boost_test_run(${TEST} DEPENDS boost_unit_test_framework)
+foreach(TEST ${RUNTIME_TESTS})
+ string(REGEX MATCH "_pass$" IS_PASS ${TEST})
+ if(IS_PASS)
+ boost_test_run_fail(${TEST} "${TEST}.cpp"
+ DEPENDS boost_unit_test_framework)
+ else()
+ boost_test_run(${TEST} "${TEST}.cpp"
+ DEPENDS boost_unit_test_framework)
+ endif()
endforeach(TEST ${TESTS})
if(WIN32)
message("Need to turn on iterator debugging")
endif(WIN32)
-
-#
-ratio_test_run(ratio_test)
-ratio_test_run(typedefs_pass)
diff -urp boost_1_48_0/libs/signals2/test/CMakeLists.txt boost_1_48_0.pm/libs/signals2/test/CMakeLists.txt
--- boost_1_48_0/libs/signals2/test/CMakeLists.txt 2012-01-16 20:26:38.597583702 +0100
+++ boost_1_48_0.pm/libs/signals2/test/CMakeLists.txt 2012-01-16 21:15:35.281650746 +0100
@@ -4,6 +4,8 @@
# Distributed under the Boost Software License, Version 1.0.
# See http://www.boost.org/LICENSE_1_0.txt
#
+include("${CMAKE_SOURCE_DIR}/libs/test/depend.cmake")
+
foreach(test
connection_test
dead_slot_test
@@ -19,7 +21,7 @@ foreach(test
trackable_test
track_test
)
- boost_test_run(${test} DEPENDS boost_test_exec_monitor)
+ boost_test_run(${test} DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
endforeach()
boost_test_run(mutex_test DEPENDS boost_thread)
diff -urp boost_1_48_0/libs/statechart/test/CMakeLists.txt boost_1_48_0.pm/libs/statechart/test/CMakeLists.txt
--- boost_1_48_0/libs/statechart/test/CMakeLists.txt 2012-01-16 20:26:38.649583703 +0100
+++ boost_1_48_0.pm/libs/statechart/test/CMakeLists.txt 2012-01-16 18:04:23.577388954 +0100
@@ -30,22 +30,22 @@ macro(statechart_run TESTNAME)
boost_test_run("${TESTNAME}Normal"
${TESTNAME}.cpp
COMPILE_FLAGS "-DBOOST_DISABLE_THREADS"
- DEPENDS boost_test_exec_monitor
+ DEPENDS test_exec_monitor
)
boost_test_run("${TESTNAME}Native"
${TESTNAME}.cpp
COMPILE_FLAGS "-DBOOST_DISABLE_THREADS -DBOOST_STATECHART_USE_NATIVE_RTTI"
- DEPENDS boost_test_exec_monitor
+ DEPENDS test_exec_monitor
)
boost_test_run("${TESTNAME}Relaxed"
${TESTNAME}.cpp
COMPILE_FLAGS "-DBOOST_DISABLE_THREADS -DBOOST_STATECHART_RELAX_TRANSITION_CONTEXT"
- DEPENDS boost_test_exec_monitor
+ DEPENDS test_exec_monitor
)
boost_test_run("${TESTNAME}Both"
${TESTNAME}.cpp
COMPILE_FLAGS "-DBOOST_DISABLE_THREADS -DBOOST_STATECHART_USE_NATIVE_RTTI -DBOOST_STATECHART_RELAX_TRANSITION_CONTEXT"
- DEPENDS boost_test_exec_monitor
+ DEPENDS test_exec_monitor
)
endmacro(statechart_run)
diff -urpN boost_1_48_0/libs/test/depend.cmake~ boost_1_48_0.pm/libs/test/depend.cmake~
--- boost_1_48_0/libs/test/depend.cmake~ 1970-01-01 01:00:00.000000000 +0100
+++ boost_1_48_0.pm/libs/test/depend.cmake~ 2012-01-16 20:50:35.462616464 +0100
@@ -0,0 +1,11 @@
+set (DEP_BOOST_TEST_EXEC_MONITOR "boost_test_exec_monitor")
+
+if (NOT BUILD_SINGLE_THREADED)
+ set (DEP_BOOST_TEST_EXEC_MONITOR "${DEP_BOOST_TEST_EXEC_MONITOR}-mt")
+endif (NOT BUILD_SINGLE_THREADED)
+
+set (DEP_BOOST_TEST_EXEC_MONITOR "${DEP_BOOST_TEST_EXEC_MONITOR}-static")
+
+if (NOT BUILD_RELEASE)
+ set (DEP_BOOST_TEST_EXEC_MONITOR "${DEP_BOOST_TEST_EXEC_MONITOR}-debug")
+endif (NOT BUILD_RELEASE)
diff -urp boost_1_48_0/libs/tokenizer/test/CMakeLists.txt boost_1_48_0.pm/libs/tokenizer/test/CMakeLists.txt
--- boost_1_48_0/libs/tokenizer/test/CMakeLists.txt 2012-01-16 20:26:38.657583705 +0100
+++ boost_1_48_0.pm/libs/tokenizer/test/CMakeLists.txt 2012-01-16 21:14:52.199649553 +0100
@@ -6,8 +6,9 @@
#
boost_additional_test_dependencies(tokenizer BOOST_DEPENDS test config detail iterator utility array intrusive)
-boost_test_run(examples examples.cpp
- DEPENDS boost_test_exec_monitor)
+include("${CMAKE_SOURCE_DIR}/libs/test/depend.cmake")
+
+boost_test_run(examples examples.cpp DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
boost_test_run(simple_example_1 simple_example_1.cpp)
boost_test_run(simple_example_2 simple_example_2.cpp)
boost_test_run(simple_example_3 simple_example_3.cpp)
diff -urp boost_1_48_0/libs/tuple/test/CMakeLists.txt boost_1_48_0.pm/libs/tuple/test/CMakeLists.txt
--- boost_1_48_0/libs/tuple/test/CMakeLists.txt 2012-01-16 20:26:38.659583705 +0100
+++ boost_1_48_0.pm/libs/tuple/test/CMakeLists.txt 2012-01-16 21:10:16.679643431 +0100
@@ -6,6 +6,7 @@
#
boost_additional_test_dependencies(tuple BOOST_DEPENDS test)
+include("${CMAKE_SOURCE_DIR}/libs/test/depend.cmake")
-boost_test_run(tuple_test_bench DEPENDS boost_test_exec_monitor)
-boost_test_run(io_test DEPENDS boost_test_exec_monitor)
+boost_test_run(tuple_test_bench DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(io_test DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
diff -urp boost_1_48_0/libs/utility/enable_if/test/CMakeLists.txt boost_1_48_0.pm/libs/utility/enable_if/test/CMakeLists.txt
--- boost_1_48_0/libs/utility/enable_if/test/CMakeLists.txt 2012-01-16 20:26:38.666583705 +0100
+++ boost_1_48_0.pm/libs/utility/enable_if/test/CMakeLists.txt 2012-01-16 21:00:38.222630238 +0100
@@ -4,6 +4,9 @@
# Distributed under the Boost Software License, Version 1.0.
# See http://www.boost.org/LICENSE_1_0.txt
#
+
+include("${CMAKE_SOURCE_DIR}/libs/test/depend.cmake")
+
foreach(T
constructors
dummy_arg_disambiguation
@@ -14,7 +17,5 @@ foreach(T
no_disambiguation
partial_specializations
)
- boost_test_run(${T} DEPENDS boost_test_exec_monitor)
+ boost_test_run(${T} DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
endforeach()
-
-
diff -urp boost_1_48_0/libs/utility/swap/test/CMakeLists.txt boost_1_48_0.pm/libs/utility/swap/test/CMakeLists.txt
--- boost_1_48_0/libs/utility/swap/test/CMakeLists.txt 2012-01-16 20:26:38.667583705 +0100
+++ boost_1_48_0.pm/libs/utility/swap/test/CMakeLists.txt 2012-01-16 21:02:48.199633169 +0100
@@ -12,9 +12,7 @@ foreach(T
boost_test_compile(${T})
endforeach()
-
-# [ run primitive.cpp ../../../test/build//boost_test_exec_monitor/<link>static ]
-
+include("${CMAKE_SOURCE_DIR}/libs/test/depend.cmake")
foreach(T
primitive
@@ -36,6 +34,6 @@ foreach(T
array_of_class
array_of_int
array_of_template)
- boost_test_run(${T} DEPENDS boost_test_exec_monitor)
+ boost_test_run(${T} DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
endforeach()
diff -urp boost_1_48_0/libs/utility/test/CMakeLists.txt boost_1_48_0.pm/libs/utility/test/CMakeLists.txt
--- boost_1_48_0/libs/utility/test/CMakeLists.txt 2012-01-16 20:26:38.667583705 +0100
+++ boost_1_48_0.pm/libs/utility/test/CMakeLists.txt 2012-01-16 21:04:04.639634954 +0100
@@ -6,6 +6,8 @@
#
boost_additional_test_dependencies(utility BOOST_DEPENDS test)
+include("${CMAKE_SOURCE_DIR}/libs/test/depend.cmake")
+
boost_test_run(addressof_fn_test ../addressof_fn_test.cpp)
boost_test_run(addressof_test ../addressof_test.cpp)
boost_test_run(addressof_test2 ../addressof_test2.cpp)
@@ -15,26 +17,22 @@ boost_test_run(binary_search_test ../bin
boost_test_run(call_traits_test ../call_traits_test.cpp ARGS -u)
boost_test_compile_fail(checked_delete_test ../checked_delete_test.cpp)
boost_test_run(compressed_pair_test
- ../compressed_pair_test
- DEPENDS boost_test_exec_monitor)
+ ../compressed_pair_test DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
boost_test_run(current_function_test ../current_function_test.cpp)
boost_test_run(iterators_test
- ../iterators_test.cpp
- DEPENDS boost_test_exec_monitor)
-boost_test_run(next_prior_test DEPENDS boost_test_exec_monitor)
+ ../iterators_test.cpp DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
+boost_test_run(next_prior_test DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
boost_test_compile_fail(noncopyable_test ../noncopyable_test.cpp)
boost_test_run(numeric_traits_test ../numeric_traits_test.cpp)
if (${CMAKE_SYSTEM} MATCHES "FreeBSD-.*")
boost_test_compile_fail("operators_test_compilerbug")
elseif(${CMAKE_SYSTEM} MATCHES "FreeBSD-.*")
boost_test_run(operators_test
- ../operators_test.cpp
- DEPENDS boost_test_exec_monitor)
+ ../operators_test.cpp DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
endif(${CMAKE_SYSTEM} MATCHES "FreeBSD-.*")
boost_test_compile(ref_ct_test ../ref_ct_test.cpp)
boost_test_run(ref_test
- ../ref_test.cpp
- DEPENDS boost_test_exec_monitor)
+ ../ref_test.cpp DEPENDS ${DEP_BOOST_TEST_EXEC_MONITOR})
boost_test_compile(result_of_test)
boost_test_run(shared_iterator_test ../shared_iterator_test.cpp)
boost_test_run(value_init_test ../value_init_test.cpp)
@@ -44,4 +42,4 @@ boost_test_compile_fail(value_init_test_
../value_init_test_fail2.cpp)
boost_test_compile_fail(value_init_test_fail3
../value_init_test_fail3.cpp)
-boost_test_run(verify_test ../verify_test.cpp)
\ No newline at end of file
+boost_test_run(verify_test ../verify_test.cpp)
_______________________________________________
Boost-cmake mailing list
Boost-cmake@lists.boost.org
http://lists.boost.org/mailman/listinfo.cgi/boost-cmake
