[Boost-commit] svn:boost r47575 - branches/CMake/release/libs/tr1/test

From: dgregor_at_[hidden]
Date: 2008-07-18 13:32:55

Author: dgregor
Date: 2008-07-18 13:32:55 EDT (Fri, 18 Jul 2008)
New Revision: 47575
URL: http://svn.boost.org/trac/boost/changeset/47575

Log:
Cleanup TR1 tests significantly, but not completely.
Text files modified: 
   branches/CMake/release/libs/tr1/test/CMakeLists.txt |    26 +++++++++++++-------------              
   1 files changed, 13 insertions(+), 13 deletions(-)

Modified: branches/CMake/release/libs/tr1/test/CMakeLists.txt
==============================================================================
--- branches/CMake/release/libs/tr1/test/CMakeLists.txt	(original)
+++ branches/CMake/release/libs/tr1/test/CMakeLists.txt	2008-07-18 13:32:55 EDT (Fri, 18 Jul 2008)
@@ -1,17 +1,23 @@
 include_directories(${Boost_SOURCE_DIR}/boost/tr1/tr1)
+include_directories(${Boost_SOURCE_DIR}/libs/tr1/include/boost/tr1/tr1)
 
 if (BORLAND)
   # Borland's broken include mechanism needs these extra headers:
   include_directories(${Boost_SOURCE_DIR}/boost/tr1/tr1/bcc32)  
+  include_directories(${Boost_SOURCE_DIR}/libs/tr1/include//boost/tr1/tr1/bcc32)
 endif (BORLAND)
 
 macro(boost_glob_test_compile path glob_par compile_flags)
-  #message("boost_glob_test_compile ${path} ${glob_par} ${compile_flags}")
   list_contains(WITH_STD "WITH_STD" ${ARGN})
+  list_contains(STD_HEADER_TEST "STD_HEADER_TEST" ${ARGN})
   file(GLOB file_list ${path}/${glob_par})
   foreach (current_file ${file_list})
     get_filename_component(file_name ${current_file} NAME_WE)
-    boost_test_compile(${file_name} ${path}/${file_name}.cpp 
+    set(test_name "${file_name}")
+    if (${STD_HEADER_TEST})
+      set(test_name "${file_name}_header")
+    endif ()
+    boost_test_compile(${test_name} ${path}/${file_name}.cpp 
       COMPILE_FLAGS "${compile_flags}")
     if (WITH_STD)
       boost_test_compile(${file_name}_std ${path}/${file_name}.cpp 
@@ -21,7 +27,6 @@
 endmacro(boost_glob_test_compile)
 
 macro(boost_glob_test_compile_fail patch glob_par compile_flags)
-  #message("boost_glob_test_compile_fail ${path} ${glob_par} ${compile_flags}")
   file(GLOB file_list ${glob_par})
   foreach (current_file ${file_list})
     get_filename_component(file_name ${current_file} NAME_WE)
@@ -44,17 +49,12 @@
 
 
 boost_glob_test_compile(. test*.cpp "" WITH_STD)
-
 boost_glob_test_run(. run*.cpp "" WITH_STD)
-
 boost_glob_test_compile_fail(config tr1_has_tr1*fail.cpp "")
-
 boost_glob_test_compile(config tr1_has_tr1*pass.cpp "")
-
-
-message(STATUS "libs/tr1/test/CMakeLists.txt: was this just cruft?  Seems to duplicate first glob_test_compile line above")
-
 boost_glob_test_run(type_traits *.cpp "")
-# previous:
-#boost_glob_test_run(type_traits *.cpp "-DTEST_STD=1")
-#boost_glob_test_compile(std_headers *.cpp "-DTEST_STD=1")
+# TODO: there's a problem here where the testing code is generating duplicate 
+# target names.
+message(STATUS "TR1 tests need some love")
+# boost_glob_test_compile(std_headers *.cpp "-DTEST_STD=1" STD_HEADER_TEST)
+boost_glob_test_compile(cyclic_depend *.cpp "")