From: dgregor_at_[hidden]
Date: 2007-05-23 22:09:00
Author: dgregor
Date: 2007-05-23 22:08:59 EDT (Wed, 23 May 2007)
New Revision: 4216
URL: http://svn.boost.org/trac/boost/changeset/4216
Log:
CMake testing for tuple, utility, static_assert, tokenizer, and timer, plus support for passing arguments to tests
Added:
sandbox/troy/boost_1_34_0/libs/static_assert/CMakeLists.txt
sandbox/troy/boost_1_34_0/libs/static_assert/test/
sandbox/troy/boost_1_34_0/libs/static_assert/test/CMakeLists.txt
sandbox/troy/boost_1_34_0/libs/timer/CMakeLists.txt
sandbox/troy/boost_1_34_0/libs/timer/test/
sandbox/troy/boost_1_34_0/libs/timer/test/CMakeLists.txt
sandbox/troy/boost_1_34_0/libs/tokenizer/CMakeLists.txt
sandbox/troy/boost_1_34_0/libs/tokenizer/test/
sandbox/troy/boost_1_34_0/libs/tokenizer/test/CMakeLists.txt
sandbox/troy/boost_1_34_0/libs/tuple/CMakeLists.txt
sandbox/troy/boost_1_34_0/libs/tuple/test/CMakeLists.txt
sandbox/troy/boost_1_34_0/libs/utility/test/CMakeLists.txt
Text files modified:
sandbox/troy/boost_1_34_0/TODO | 9 +++++++++
sandbox/troy/boost_1_34_0/libs/utility/CMakeLists.txt | 36 +-----------------------------------
sandbox/troy/boost_1_34_0/tools/build/CMake/boost-testing.cmake | 6 +++---
3 files changed, 13 insertions(+), 38 deletions(-)
Modified: sandbox/troy/boost_1_34_0/TODO
==============================================================================
--- sandbox/troy/boost_1_34_0/TODO (original)
+++ sandbox/troy/boost_1_34_0/TODO 2007-05-23 22:08:59 EDT (Wed, 23 May 2007)
@@ -31,3 +31,12 @@
- Testing for the Spirit library
- Testing for the Statechart library
+
+- Testing for the Thread library
+
+- Testing for the TR1 library (globs for tests)
+
+- Testing for the type traits library (globs for tests)
+
+- Testing for the typeof library
+
Added: sandbox/troy/boost_1_34_0/libs/static_assert/CMakeLists.txt
==============================================================================
--- (empty file)
+++ sandbox/troy/boost_1_34_0/libs/static_assert/CMakeLists.txt 2007-05-23 22:08:59 EDT (Wed, 23 May 2007)
@@ -0,0 +1,4 @@
+boost_library_project(
+ Static_assert
+ TESTDIRS test
+ )
\ No newline at end of file
Added: sandbox/troy/boost_1_34_0/libs/static_assert/test/CMakeLists.txt
==============================================================================
--- (empty file)
+++ sandbox/troy/boost_1_34_0/libs/static_assert/test/CMakeLists.txt 2007-05-23 22:08:59 EDT (Wed, 23 May 2007)
@@ -0,0 +1,13 @@
+boost_test_run(static_assert_test SOURCES ../static_assert_test.cpp)
+boost_test_run(static_assert_example_2 SOURCES ../static_assert_example_2.cpp)
+boost_test_run(static_assert_example_3 SOURCES ../static_assert_example_3.cpp)
+boost_test_compile_fail(static_assert_test_fail_1 SOURCES ../static_assert_test_fail_1.cpp)
+boost_test_compile_fail(static_assert_test_fail_2 SOURCES ../static_assert_test_fail_2.cpp)
+boost_test_compile_fail(static_assert_test_fail_3 SOURCES ../static_assert_test_fail_3.cpp)
+boost_test_compile_fail(static_assert_test_fail_4 SOURCES ../static_assert_test_fail_4.cpp)
+boost_test_compile_fail(static_assert_test_fail_5 SOURCES ../static_assert_test_fail_5.cpp)
+boost_test_compile_fail(static_assert_test_fail_6 SOURCES ../static_assert_test_fail_6.cpp)
+boost_test_compile_fail(static_assert_test_fail_7 SOURCES ../static_assert_test_fail_7.cpp)
+boost_test_compile_fail(static_assert_test_fail_8 SOURCES ../static_assert_test_fail_8.cpp)
+boost_test_compile_fail(static_assert_test_fail_9 SOURCES ../static_assert_test_fail_9.cpp)
+boost_test_compile_fail(static_assert_test_fail_10 SOURCES ../static_assert_test_fail_10.cpp)
Added: sandbox/troy/boost_1_34_0/libs/timer/CMakeLists.txt
==============================================================================
--- (empty file)
+++ sandbox/troy/boost_1_34_0/libs/timer/CMakeLists.txt 2007-05-23 22:08:59 EDT (Wed, 23 May 2007)
@@ -0,0 +1,4 @@
+boost_library_project(
+ Timer
+ TESTDIRS test
+ )
\ No newline at end of file
Added: sandbox/troy/boost_1_34_0/libs/timer/test/CMakeLists.txt
==============================================================================
--- (empty file)
+++ sandbox/troy/boost_1_34_0/libs/timer/test/CMakeLists.txt 2007-05-23 22:08:59 EDT (Wed, 23 May 2007)
@@ -0,0 +1 @@
+boost_test_compile(timer_test SOURCES ../timer_test.cpp)
\ No newline at end of file
Added: sandbox/troy/boost_1_34_0/libs/tokenizer/CMakeLists.txt
==============================================================================
--- (empty file)
+++ sandbox/troy/boost_1_34_0/libs/tokenizer/CMakeLists.txt 2007-05-23 22:08:59 EDT (Wed, 23 May 2007)
@@ -0,0 +1,4 @@
+boost_library_project(
+ Tokenizer
+ TESTDIRS test
+ )
\ No newline at end of file
Added: sandbox/troy/boost_1_34_0/libs/tokenizer/test/CMakeLists.txt
==============================================================================
--- (empty file)
+++ sandbox/troy/boost_1_34_0/libs/tokenizer/test/CMakeLists.txt 2007-05-23 22:08:59 EDT (Wed, 23 May 2007)
@@ -0,0 +1,7 @@
+boost_test_run(examples SOURCES ../examples.cpp
+ LIBRARIES boost_test_exec_monitor-static)
+boost_test_run(simple_example_1 SOURCES ../simple_example_1.cpp)
+boost_test_run(simple_example_2 SOURCES ../simple_example_2.cpp)
+boost_test_run(simple_example_3 SOURCES ../simple_example_3.cpp)
+boost_test_run(simple_example_4 SOURCES ../simple_example_4.cpp)
+boost_test_run(simple_example_5 SOURCES ../simple_example_5.cpp)
Added: sandbox/troy/boost_1_34_0/libs/tuple/CMakeLists.txt
==============================================================================
--- (empty file)
+++ sandbox/troy/boost_1_34_0/libs/tuple/CMakeLists.txt 2007-05-23 22:08:59 EDT (Wed, 23 May 2007)
@@ -0,0 +1,4 @@
+boost_library_project(
+ Tuple
+ TESTDIRS test
+ )
\ No newline at end of file
Added: sandbox/troy/boost_1_34_0/libs/tuple/test/CMakeLists.txt
==============================================================================
--- (empty file)
+++ sandbox/troy/boost_1_34_0/libs/tuple/test/CMakeLists.txt 2007-05-23 22:08:59 EDT (Wed, 23 May 2007)
@@ -0,0 +1,2 @@
+boost_test_run(tuple_test_bench boost_test_exec_monitor-static)
+boost_test_run(io_test LIBRARIES boost_test_exec_monitor-static)
Modified: sandbox/troy/boost_1_34_0/libs/utility/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/utility/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/utility/CMakeLists.txt 2007-05-23 22:08:59 EDT (Wed, 23 May 2007)
@@ -1,39 +1,5 @@
boost_library_project(
Utility
+ TESTDIRS test
)
-# [ run call_traits_test.cpp : -u ] ???? -u ????
-
-set(tests
- addressof_test
- assert_test
- base_from_member_test
- binary_search_test
- numeric_traits_test
- shared_iterator_test
- value_init_test
- )
-foreach(test ${tests})
- boost_test_run(${test})
-endforeach(test ${tests})
-boost_test_run(none_test SOURCES test/none_test.cpp)
-
-
-# this one needs args
-#boost_test_Run(compressed_pair_test DEPENDS boost_test_exec_monitor-static/<link>static : -u ]
-# [ run ../current_function_test.cpp : : : <test-info>always_show_run_output ]
-
-# [ run ../iterators_test.cpp ../../test/build//boost_test_exec_monitor/<link>static ]
-# [ run next_prior_test.cpp ../../test/build//boost_test_exec_monitor/<link>static ]
-# [ run ../operators_test.cpp ../../test/build//boost_test_exec_monitor/<link>static ]
-# [ run ../ref_test.cpp ../../test/build//boost_test_exec_monitor/<link>static ]
-
-boost_test_compile_fail(noncopyable_test)
-
-
-boost_test_compile(ref_ct_test)
-boost_test_compile(test/result_of_test)
-boost_test_compile_fail(value_init_test_fail1)
-boost_test_compile_fail(value_init_test_fail2)
-boost_test_compile_fail(value_init_test_fail3)
-boost_test_compile_fail(checked_delete_test)
Added: sandbox/troy/boost_1_34_0/libs/utility/test/CMakeLists.txt
==============================================================================
--- (empty file)
+++ sandbox/troy/boost_1_34_0/libs/utility/test/CMakeLists.txt 2007-05-23 22:08:59 EDT (Wed, 23 May 2007)
@@ -0,0 +1,33 @@
+boost_test_run(addressof_test SOURCES ../addressof_test.cpp)
+boost_test_run(assert_test SOURCES ../assert_test.cpp)
+boost_test_run(base_from_member_test SOURCES ../base_from_member_test.cpp)
+boost_test_run(binary_search_test SOURCES ../binary_search_test.cpp)
+boost_test_run(call_traits_test ARGS -u SOURCES ../call_traits_test.cpp)
+boost_test_compile_fail(checked_delete_test SOURCES ../checked_delete_test.cpp)
+boost_test_run(compressed_pair_test
+ SOURCES ../compressed_pair_test
+ LIBRARIES boost_test_exec_monitor-static)
+boost_test_run(current_function_test SOURCES ../current_function_test.cpp)
+boost_test_run(iterators_test
+ SOURCES ../iterators_test.cpp
+ LIBRARIES boost_test_exec_monitor-static)
+boost_test_run(next_prior_test LIBRARIES boost_test_exec_monitor-static)
+boost_test_compile_fail(noncopyable_test SOURCES ../noncopyable_test.cpp)
+boost_test_run(numeric_traits_test SOURCES ../numeric_traits_test.cpp)
+boost_test_run(operators_test
+ SOURCES ../operators_test.cpp
+ LIBRARIES boost_test_exec_monitor-static)
+boost_test_compile(ref_ct_test SOURCES ../ref_ct_test.cpp)
+boost_test_run(ref_test
+ SOURCES ../ref_test.cpp
+ LIBRARIES boost_test_exec_monitor-static)
+boost_test_compile(result_of_test)
+boost_test_run(shared_iterator_test SOURCES ../shared_iterator_test.cpp)
+boost_test_run(value_init_test SOURCES ../value_init_test.cpp)
+boost_test_compile_fail(value_init_test_fail1
+ SOURCES ../value_init_test_fail1.cpp)
+boost_test_compile_fail(value_init_test_fail2
+ SOURCES ../value_init_test_fail2.cpp)
+boost_test_compile_fail(value_init_test_fail3
+ SOURCES ../value_init_test_fail3.cpp)
+boost_test_run(none_test)
Modified: sandbox/troy/boost_1_34_0/tools/build/CMake/boost-testing.cmake
==============================================================================
--- sandbox/troy/boost_1_34_0/tools/build/CMake/boost-testing.cmake (original)
+++ sandbox/troy/boost_1_34_0/tools/build/CMake/boost-testing.cmake 2007-05-23 22:08:59 EDT (Wed, 23 May 2007)
@@ -42,7 +42,7 @@
set(BOOST_TEST_OKAY TRUE)
set(BOOST_TEST_COMPILE_FLAGS "")
parse_arguments(BOOST_TEST
- "SOURCES;LIBRARIES;DEPENDS;COMPILE_FLAGS"
+ "SOURCES;LIBRARIES;DEPENDS;COMPILE_FLAGS;ARGS"
""
${ARGN}
)
@@ -91,7 +91,7 @@
TO_PROPNAME COMPILE_FLAGS
)
endforeach(_depend ${BOOST_TEST_DEPENDS})
- add_test("${PROJECT_NAME}::${testname}" ${EXECUTABLE_OUTPUT_PATH}/${PROJECT_NAME}/${testname})
+ add_test("${PROJECT_NAME}::${testname}" ${EXECUTABLE_OUTPUT_PATH}/${PROJECT_NAME}/${testname} ARGS ${BOOST_TEST_ARGS})
endif(BOOST_TEST_OKAY)
endmacro(boost_test_run)
@@ -108,7 +108,7 @@
target_link_libraries(${testname} ${BOOST_TEST_DEPENDS})
target_link_libraries(${testname} ${BOOST_TEST_LIBRARIES})
- add_test("${PROJECT_NAME}::${testname}" ${EXECUTABLE_OUTPUT_PATH}/${PROJECT_NAME}/${testname})
+ add_test("${PROJECT_NAME}::${testname}" ${EXECUTABLE_OUTPUT_PATH}/${PROJECT_NAME}/${testname} ARGS ${BOOST_TEST_ARGS})
set_tests_properties("${PROJECT_NAME}::${testname}" PROPERTIES WILL_FAIL TRUE)
endif(BOOST_TEST_OKAY)
endmacro(boost_test_run_fail)