diff options
author | Dimitri John Ledkov <xnox@ubuntu.com> | 2019-12-03 18:24:04 +0000 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2019-12-05 15:06:44 +0100 |
commit | 6d4cd58cd4b1b2f3906889009da7b71931645e93 (patch) | |
tree | 79060a11823f51b24eb5a6c56696f8aec26e0efd /test/CMakeLists.txt | |
parent | 571c8c59715656c317e1c352ea5012171583ce05 (diff) | |
download | fork-ledger-6d4cd58cd4b1b2f3906889009da7b71931645e93.tar.gz fork-ledger-6d4cd58cd4b1b2f3906889009da7b71931645e93.tar.bz2 fork-ledger-6d4cd58cd4b1b2f3906889009da7b71931645e93.zip |
Modernize CMake using backported FindPython module.
Diffstat (limited to 'test/CMakeLists.txt')
-rw-r--r-- | test/CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 41eecb36..867abbd4 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -15,14 +15,14 @@ if (HAVE_BOOST_PYTHON) endif() macro(add_ledger_harness_tests _class) - if (PYTHONINTERP_FOUND) + if (Python_EXECUTABLE) 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 EQUAL -1) OR HAVE_BOOST_PYTHON) add_test(NAME ${_class}Test_${TestFile_Name} - COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/RegressTests.py + COMMAND ${Python_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/RegressTests.py $<TARGET_FILE:ledger> ${PROJECT_SOURCE_DIR} ${TestFile} ${TEST_PYTHON_FLAGS}) set_tests_properties(${_class}Test_${TestFile_Name} @@ -36,13 +36,13 @@ add_subdirectory(manual) add_subdirectory(baseline) add_subdirectory(regress) -if (PYTHONINTERP_FOUND) +if (Python_EXECUTABLE) set(_class DocTests) file(GLOB ${_class}_TESTS ${PROJECT_SOURCE_DIR}/doc/*.texi) foreach(TestFile ${${_class}_TESTS}) get_filename_component(TestFile_Name ${TestFile} NAME_WE) add_test(NAME ${_class}Test_${TestFile_Name} - COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/${_class}.py + COMMAND ${Python_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/${_class}.py --ledger $<TARGET_FILE:ledger> --file ${TestFile}) set_tests_properties(${_class}Test_${TestFile_Name} PROPERTIES ENVIRONMENT "TZ=${Ledger_TEST_TIMEZONE}") @@ -53,7 +53,7 @@ if (PYTHONINTERP_FOUND) list(APPEND CheckOptions CheckBaselineTests) #CheckManpage CheckTexinfo foreach(_class ${CheckOptions}) add_test(NAME ${_class} - COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/${_class}.py + COMMAND ${Python_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/${_class}.py --ledger $<TARGET_FILE:ledger> --source ${PROJECT_SOURCE_DIR}) set_tests_properties(${_class} PROPERTIES ENVIRONMENT "TZ=${Ledger_TEST_TIMEZONE}") |