From ceb721ca252e6ed71ae85df00b7b4727aca630f7 Mon Sep 17 00:00:00 2001 From: Marcelo Lira Date: Sat, 6 Aug 2011 12:02:29 -0300 Subject: Test's names now have their module as prefix. So they can be ran by module. --- tests/CMakeLists.txt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index ef84fd2d2..8430e0eca 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -51,13 +51,14 @@ else() endif() foreach(test_file ${TEST_FILES}) - string(REGEX MATCH "/([^/]+)_test.py" test_name ${test_file}) - list(FIND test_blacklist ${CMAKE_MATCH_1} expect_fail) - add_test(${CMAKE_MATCH_1} ${PYTHON_EXECUTABLE} ${test_file}) - set_tests_properties(${CMAKE_MATCH_1} PROPERTIES ENVIRONMENT "PYTHONPATH=${TEST_PYTHONPATH};${LIBRARY_PATH_VAR}=${TEST_LIBRARY_PATH}") - set_tests_properties(${CMAKE_MATCH_1} PROPERTIES TIMEOUT ${CTEST_TESTING_TIMEOUT}) + string(REGEX MATCH "/([^/]+)binding/([^/]+)_test.py" tmp ${test_file}) + set(test_name "${CMAKE_MATCH_1}_${CMAKE_MATCH_2}") + list(FIND test_blacklist ${test_name} expect_fail) + add_test(${test_name} ${PYTHON_EXECUTABLE} ${test_file}) + set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "PYTHONPATH=${TEST_PYTHONPATH};${LIBRARY_PATH_VAR}=${TEST_LIBRARY_PATH}") + set_tests_properties(${test_name} PROPERTIES TIMEOUT ${CTEST_TESTING_TIMEOUT}) if (${expect_fail} GREATER -1) - set_tests_properties(${CMAKE_MATCH_1} PROPERTIES WILL_FAIL TRUE) + set_tests_properties(${test_name} PROPERTIES WILL_FAIL TRUE) endif() endforeach() endif() -- cgit v1.2.3