From 2d4b9c6298537b1f63bbd6249735b18142b53905 Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Fri, 3 Apr 2020 16:22:09 -0400 Subject: [PATCH] [cmake] Use PYTHON_EXECUTABLE over PYTHON_INTERPRETER to be consistent with gtest, pybind .. --- test/c++/CMakeLists.txt | 1 + test/python/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/c++/CMakeLists.txt b/test/c++/CMakeLists.txt index 4f31f316..86ccb533 100644 --- a/test/c++/CMakeLists.txt +++ b/test/c++/CMakeLists.txt @@ -1,4 +1,5 @@ # Build googletest +set(PYTHON_EXECUTABLE ${TRIQS_PYTHON_EXECUTABLE}) add_subdirectory(gtest EXCLUDE_FROM_ALL) # Copy h5 files to binary dir diff --git a/test/python/CMakeLists.txt b/test/python/CMakeLists.txt index 4f6bdcb9..aa9d877e 100644 --- a/test/python/CMakeLists.txt +++ b/test/python/CMakeLists.txt @@ -10,6 +10,6 @@ set(all_tests Basic) foreach(test ${all_tests}) get_filename_component(test_name ${test} NAME_WE) get_filename_component(test_dir ${test} DIRECTORY) - add_test(NAME Py_${test_name} COMMAND ${TRIQS_PYTHON_INTERPRETER} ${CMAKE_CURRENT_SOURCE_DIR}/${test_dir}/${test_name}.py WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir}) + add_test(NAME Py_${test_name} COMMAND ${TRIQS_PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${test_dir}/${test_name}.py WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir}) set_property(TEST Py_${test_name} APPEND PROPERTY ENVIRONMENT PYTHONPATH=${PROJECT_BINARY_DIR}/python:$ENV{PYTHONPATH} ${SANITIZER_RT_PRELOAD}) endforeach()