From a177a3f72941119ecc1b8b5a015264cd0d77b7d1 Mon Sep 17 00:00:00 2001 From: Brendan Le Foll Date: Wed, 1 Jun 2016 11:21:20 +0100 Subject: [PATCH] cmake: Fix tests with multiple python bindings being built Signed-off-by: Brendan Le Foll --- CMakeLists.txt | 8 +++----- tests/CMakeLists.txt | 17 +++++++++++------ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 02a17fc..5b3910b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -196,9 +196,7 @@ if (IMRAA) add_subdirectory (imraa) endif () -if (BUILDTESTS) - if (${PYTHONINTERP_FOUND}) - enable_testing () - add_subdirectory (tests) - endif () +if (BUILDTESTS AND PYTHON_DEFAULT_EXECUTABLE) + enable_testing () + add_subdirectory (tests) endif () diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 6ebb8bd..df3baf8 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -9,12 +9,17 @@ if (BUILDSWIGJAVA) endif() if (BUILDSWIGPYTHON) - add_test (NAME py_general COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/general_checks.py) - set_tests_properties(py_general PROPERTIES ENVIRONMENT "PYTHONPATH=${CMAKE_BINARY_DIR}/src/python/") + if (PYTHON2INTERP_FOUND) + set (PYTHON_DEFAULT_PYTHONPATH "${CMAKE_BINARY_DIR}/src/python/python2") + elseif (PYTHON3INTERP_FOUND) + set (PYTHON_DEFAULT_PYTHONPATH "${CMAKE_BINARY_DIR}/src/python/python3") + endif () + add_test (NAME py_general COMMAND ${PYTHON_DEFAULT_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/general_checks.py) + set_tests_properties(py_general PROPERTIES ENVIRONMENT "PYTHONPATH=${PYTHON_DEFAULT_PYTHONPATH}") - add_test (NAME py_platform COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/platform_checks.py) - set_tests_properties(py_platform PROPERTIES ENVIRONMENT "PYTHONPATH=${CMAKE_BINARY_DIR}/src/python/") + add_test (NAME py_platform COMMAND ${PYTHON_DEFAULT_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/platform_checks.py) + set_tests_properties(py_platform PROPERTIES ENVIRONMENT "PYTHONPATH=${PYTHON_DEFAULT_PYTHONPATH}") - add_test (NAME py_gpio COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/gpio_checks.py) - set_tests_properties(py_gpio PROPERTIES ENVIRONMENT "PYTHONPATH=${CMAKE_BINARY_DIR}/src/python/") + add_test (NAME py_gpio COMMAND ${PYTHON_DEFAULT_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/gpio_checks.py) + set_tests_properties(py_gpio PROPERTIES ENVIRONMENT "PYTHONPATH=${PYTHON_DEFAULT_PYTHONPATH}") endif()