[Boost-commit] svn:boost r43507 - in branches/CMake/release: libs/python/test libs/xpressive/test tools/build/CMake

From: dgregor_at_[hidden]
Date: 2008-03-05 01:25:04

Author: dgregor
Date: 2008-03-05 01:25:03 EST (Wed, 05 Mar 2008)
New Revision: 43507
URL: http://svn.boost.org/trac/boost/changeset/43507

Log:
libs/python/test/pyrun.py: 
  - Needed to run the Python tests

libs/xpressive/test/CMakeLists.txt:
  - Xpressive tests depend on boost_unit_test_monitor

tools/build/CMake/BoostTesting.cmake:
  - Clean up implementation of compile and link tests

Added:
   branches/CMake/release/libs/python/test/pyrun.py   (contents, props changed)
Text files modified: 
   branches/CMake/release/libs/xpressive/test/CMakeLists.txt   |     2 +-                                      
   branches/CMake/release/tools/build/CMake/BoostTesting.cmake |    24 ++++++++++++------------                
   2 files changed, 13 insertions(+), 13 deletions(-)

Added: branches/CMake/release/libs/python/test/pyrun.py
==============================================================================
--- (empty file)
+++ branches/CMake/release/libs/python/test/pyrun.py	2008-03-05 01:25:03 EST (Wed, 05 Mar 2008)
@@ -0,0 +1,11 @@
+# Simple Python script that acts as a bridge to any other Python
+# script. It first sets sys.path to the first argument, then runs the
+# script specified by the second argument. All remaining arguments are
+# passed to the script.
+import sys
+sys.argv[0] = sys.argv[2]
+sys.path.insert(0, sys.argv[1])
+script_file = open(sys.argv[2], "r")
+sys.argv.pop(1)
+sys.argv.pop(1)
+exec(script_file)

Modified: branches/CMake/release/libs/xpressive/test/CMakeLists.txt
==============================================================================
--- branches/CMake/release/libs/xpressive/test/CMakeLists.txt	(original)
+++ branches/CMake/release/libs/xpressive/test/CMakeLists.txt	2008-03-05 01:25:03 EST (Wed, 05 Mar 2008)
@@ -47,7 +47,7 @@
   test_dynamic)
 
 foreach(runtest ${runtests})
-  boost_test_run(${runtest})
+  boost_test_run(${runtest} DEPENDS boost_unit_test_framework)
 endforeach(runtest ${runtests})
 
 set(compiletests

Modified: branches/CMake/release/tools/build/CMake/BoostTesting.cmake
==============================================================================
--- branches/CMake/release/tools/build/CMake/BoostTesting.cmake	(original)
+++ branches/CMake/release/tools/build/CMake/BoostTesting.cmake	2008-03-05 01:25:03 EST (Wed, 05 Mar 2008)
@@ -249,10 +249,10 @@
     add_test("${PROJECT_NAME}::${testname}"
                ${CMAKE_CTEST_COMMAND}
              --build-and-test
-             "${Boost_SOURCE_DIR}/tools/build/CMake/LinkTest"
-             "${Boost_BINARY_DIR}/tools/build/CMake/LinkTest"
-             --build-generator "${CMAKE_GENERATOR}"
-             --build-makeprogram "${MAKEPROGRAM}"
+             ${Boost_SOURCE_DIR}/tools/build/CMake/LinkTest
+             ${Boost_BINARY_DIR}/tools/build/CMake/LinkTest
+             --build-generator {CMAKE_GENERATOR}
+             --build-makeprogram ${MAKEPROGRAM}
              --build-project LinkTest
              --build-options -DSOURCE=${CMAKE_CURRENT_SOURCE_DIR}/${BOOST_TEST_SOURCES} -DINCLUDES=${Boost_SOURCE_DIR} -DCOMPILE_FLAGS="${BOOST_TEST_COMPILE_FLAGS}")
   endif(BOOST_TEST_OKAY)
@@ -290,10 +290,10 @@
     add_test("${PROJECT_NAME}::${testname}"
                ${CMAKE_CTEST_COMMAND}
              --build-and-test
-             "${Boost_SOURCE_DIR}/tools/build/CMake/CompileTest"
-             "${Boost_BINARY_DIR}/tools/build/CMake/CompileTest"
-             --build-generator "${CMAKE_GENERATOR}"
-             --build-makeprogram "${MAKEPROGRAM}"
+             ${Boost_SOURCE_DIR}/tools/build/CMake/CompileTest
+             ${Boost_BINARY_DIR}/tools/build/CMake/CompileTest
+             --build-generator ${CMAKE_GENERATOR}
+             --build-makeprogram ${MAKEPROGRAM}
              --build-project CompileTest
              --build-options -DSOURCE=${CMAKE_CURRENT_SOURCE_DIR}/${BOOST_TEST_SOURCES} -DINCLUDES=${BOOST_TEST_INCLUDES} -DCOMPILE_FLAGS=${BOOST_TEST_COMPILE_FLAGS})
   endif(BOOST_TEST_OKAY)
@@ -331,10 +331,10 @@
     add_test("${PROJECT_NAME}::${testname}"
              ${CMAKE_CTEST_COMMAND}
              --build-and-test
-             "${Boost_SOURCE_DIR}/tools/build/CMake/CompileTest"
-             "${Boost_BINARY_DIR}/tools/build/CMake/CompileTest"
-             --build-generator "${CMAKE_GENERATOR}"
-             --build-makeprogram "${MAKEPROGRAM}"
+             ${Boost_SOURCE_DIR}/tools/build/CMake/CompileTest
+             ${Boost_BINARY_DIR}/tools/build/CMake/CompileTest
+             --build-generator ${CMAKE_GENERATOR}
+             --build-makeprogram ${MAKEPROGRAM}
              --build-project CompileTest
              --build-options -DSOURCE=${CMAKE_CURRENT_SOURCE_DIR}/${BOOST_TEST_SOURCES} -DINCLUDES=${BOOST_TEST_INCLUDES} -DCOMPILE_FLAGS=${BOOST_TEST_COMPILE_FLAGS})
     set_tests_properties("${PROJECT_NAME}::${testname}" PROPERTIES WILL_FAIL ON)