diff options
Diffstat (limited to 'test/CMakeLists.txt')
| -rw-r--r-- | test/CMakeLists.txt | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 301959db..25d91a9e 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -19,19 +19,11 @@ macro(add_ledger_harness_tests _class) file(GLOB ${_class}_TESTS *.test) foreach(TestFile ${${_class}_TESTS}) get_filename_component(TestFile_Name ${TestFile} NAME_WE) - string(FIND ${TestFile_Name} "_py" TestFile_IsPythonTest) - if ((TestFile_IsPythonTest GREATER -1)) - get_filename_component(TestFile_FullName ${TestFile} NAME) - string(FIND ${TestFile_FullName} "_py.test" TestFile_IsAnyPythonTest) - string(FIND ${TestFile_FullName} "_py${Python_VERSION_MAJOR}.test" TestFile_IsThisPythonTest) - if ((TestFile_IsAnyPythonTest EQUAL -1) AND (TestFile_IsThisPythonTest EQUAL -1)) - continue() - endif() - endif() + string(FIND ${TestFile_Name} "_py.test" TestFile_IsPythonTest) if ((TestFile_IsPythonTest EQUAL -1) OR HAVE_BOOST_PYTHON) add_test(NAME ${_class}Test_${TestFile_Name} COMMAND ${Python_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/RegressTests.py - $<TARGET_FILE:ledger> ${PROJECT_SOURCE_DIR} + --ledger $<TARGET_FILE:ledger> --sourcepath ${PROJECT_SOURCE_DIR} ${TestFile} ${TEST_PYTHON_FLAGS}) set_tests_properties(${_class}Test_${TestFile_Name} PROPERTIES ENVIRONMENT "TZ=${Ledger_TEST_TIMEZONE}") |