tests: add USEPYTHON3TESTS to explicitly use python3 for tests

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>

CMakeLists.txt

@@ -140,6 +140,7 @@ option (ENABLEEXAMPLES "Disable building of examples" ON)
 option (INSTALLGPIOTOOL "Install gpio tool" OFF)
 option (INSTALLTOOLS "Install all tools" ON)
 option (BUILDTESTS "Override the addition of tests" ON)
+option (USEPYTHON3TESTS "Force tests to run with python3" OFF)
 
 set (BUILDARCH "" CACHE STRING "Override architecture to build for")
 

Dockerfile

@@ -50,6 +50,7 @@ ARG BUILDTESTS
 ARG CC
 ARG CXX
 ARG NODE_VERSION
+ARG USEPYTHON3TESTS
 
 # Configure Build Environment
 ENV NVM_DIR /root/.nvm
@@ -95,6 +96,7 @@ RUN . $NVM_DIR/nvm.sh && cmake \
     -DINSTALLGPIOTOOL=$INSTALLGPIOTOOL \
     -DINSTALLTOOLS=$INSTALLTOOLS \
     -DBUILDTESTS=$BUILDTESTS \
+    -DUSEPYTHON3TESTS=$USEPYTHON3TESTS \
     ..
 
 CMD make

docker-compose.yaml

@@ -53,6 +53,9 @@ services:
 
   python3:
     extends: python2
+    build:
+      args:
+        - USEPYTHON3TESTS=ON
     command: bash -c "make _python3-mraa && ctest --output-on-failure"
 
   java:

tests/CMakeLists.txt

@@ -9,12 +9,14 @@ if (PYTHON2INTERP_FOUND AND BUILDSWIGJAVA)
 endif ()
 
 if (BUILDSWIGPYTHON)
-    if (PYTHON2INTERP_FOUND)
+    if (PYTHON2INTERP_FOUND AND EXISTS "${CMAKE_BINARY_DIR}/src/python/python2" AND NOT USEPYTHON3TESTS)
         set (PYTHON_DEFAULT_PYTHONPATH "${CMAKE_BINARY_DIR}/src/python/python2")
         set (PYTHON_DEFAULT_INTERP "${PYTHON2_EXECUTABLE}")
-    elseif (PYTHON3INTERP_FOUND)
+    elseif (PYTHON3INTERP_FOUND AND EXISTS "${CMAKE_BINARY_DIR}/src/python/python3")
         set (PYTHON_DEFAULT_PYTHONPATH "${CMAKE_BINARY_DIR}/src/python/python3")
         set (PYTHON_DEFAULT_INTERP "${PYTHON3_EXECUTABLE}")
+    elseif (USEPYTHON3TESTS)
+        message (FATAL "Failed to find python3{,-dev} but forced python3 tests")
     endif ()
 
     if (DEFINED PYTHON_DEFAULT_INTERP)
@@ -22,13 +24,13 @@ if (BUILDSWIGPYTHON)
             add_subdirectory (mock)
         else ()
             add_test (NAME py_general COMMAND ${PYTHON_DEFAULT_INTERP} ${CMAKE_CURRENT_SOURCE_DIR}/general_checks.py)
-            set_tests_properties(py_general PROPERTIES ENVIRONMENT "PYTHONPATH=${PYTHON_DEFAULT_PYTHONPATH}")
+        set_tests_properties (py_general PROPERTIES ENVIRONMENT "PYTHONPATH=${PYTHON_DEFAULT_PYTHONPATH}")
 
             add_test (NAME py_platform COMMAND ${PYTHON_DEFAULT_INTERP} ${CMAKE_CURRENT_SOURCE_DIR}/platform_checks.py)
-            set_tests_properties(py_platform PROPERTIES ENVIRONMENT "PYTHONPATH=${PYTHON_DEFAULT_PYTHONPATH}")
+            set_tests_properties (py_platform PROPERTIES ENVIRONMENT "PYTHONPATH=${PYTHON_DEFAULT_PYTHONPATH}")
 
             add_test (NAME py_gpio COMMAND ${PYTHON_DEFAULT_INTERP} ${CMAKE_CURRENT_SOURCE_DIR}/gpio_checks.py)
-            set_tests_properties(py_gpio PROPERTIES ENVIRONMENT "PYTHONPATH=${PYTHON_DEFAULT_PYTHONPATH}")
+            set_tests_properties (py_gpio PROPERTIES ENVIRONMENT "PYTHONPATH=${PYTHON_DEFAULT_PYTHONPATH}")
         endif ()
     else ()
         message (STATUS "Could not run tests since python interpreter or python bindings not built")