CMake: update, improve test summary invocation

* search for a Python3 interpreter for the test summary
* replace an unnecessary macro invocation with a function
* make summary depend on all other tests

Making the summary depend on all other tests fixes test execution in
random order (e.g., with `ctest --schedule-random`).

Author: christoph-conrads

CMakeLists.txt

@@ -179,13 +179,14 @@ option(BUILD_TESTING "Build tests" ${_is_coverage_build})
 include(CTest)
 message(STATUS "Build tests: ${BUILD_TESTING}")
 
-# lapack_testing.py uses features from python 2.7 and greater
 if(BUILD_TESTING)
-  set(_msg "Looking for Python >= 2.7 needed for summary tests")
+  set(_msg "Looking for Python3 needed for summary tests")
   message(STATUS "${_msg}")
-  find_package(PythonInterp 2.7 QUIET)
-  if(PYTHONINTERP_FOUND)
-    message(STATUS "${_msg} - found (${PYTHON_VERSION_STRING})")
+  # find_package(PythonInterp 3) cannot be used because /usr/bin/python may be
+  # a Python2 interpreter.
+  find_program(PYTHON_EXECUTABLE python3)
+  if(PYTHON_EXECUTABLE)
+    message(STATUS "${_msg} - found")
   else()
     message(STATUS "${_msg} - not found (skipping summary tests)")
   endif()

CTestCustom.cmake.in

@@ -46,10 +46,9 @@ set(CTEST_CUSTOM_WARNING_EXCEPTION
   "Warning: File .* has modification time .* in the future"
 )
 
-# Only rung post test if suitable python interpreter was found
-set(PYTHONINTERP_FOUND @PYTHONINTERP_FOUND@)
+# Only run post test if suitable python interpreter was found
 set(PYTHON_EXECUTABLE  @PYTHON_EXECUTABLE@)
-if(PYTHONINTERP_FOUND)
+if(PYTHON_EXECUTABLE)
   set(CTEST_CUSTOM_POST_TEST "${PYTHON_EXECUTABLE} ./lapack_testing.py -s -d TESTING")
 endif()
 

TESTING/CMakeLists.txt

@@ -6,7 +6,20 @@ if(MSVC_VERSION)
 endif()
 add_subdirectory(LIN)
 add_subdirectory(EIG)
-macro(add_lapack_test output input target)
+
+
+# Only run this test if python 3 is found
+if(PYTHON_EXECUTABLE)
+  message(STATUS "Running Summary")
+  file(COPY ${LAPACK_SOURCE_DIR}/lapack_testing.py DESTINATION ${LAPACK_BINARY_DIR})
+  add_test(
+    NAME LAPACK_Test_Summary
+    WORKING_DIRECTORY ${LAPACK_BINARY_DIR}
+    COMMAND ${PYTHON_EXECUTABLE} "lapack_testing.py"
+    )
+endif()
+
+function(add_lapack_test output input target)
   set(TEST_INPUT "${LAPACK_SOURCE_DIR}/TESTING/${input}")
   set(TEST_OUTPUT "${LAPACK_BINARY_DIR}/TESTING/${output}")
   string(REPLACE "." "_" input_name ${input})
@@ -18,8 +31,15 @@ macro(add_lapack_test output input target)
       -DOUTPUT=${TEST_OUTPUT}
       -DINTDIR=${CMAKE_CFG_INTDIR}
       -P "${LAPACK_SOURCE_DIR}/TESTING/runtest.cmake")
+
+    if(PYTHONINTERP_FOUND)
+      set_property(
+        TEST LAPACK_Test_Summary
+        APPEND PROPERTY DEPENDS LAPACK-${testName}
+      )
+    endif()
   endif()
-endmacro()
+endfunction()
 
 if(BUILD_SINGLE)
 add_lapack_test(stest.out stest.in xlintsts)
@@ -156,15 +176,3 @@ if(BUILD_COMPLEX AND BUILD_COMPLEX16)
 # ======== COMPLEX-COMPLEX16 LIN TESTS ========================
   add_lapack_test(zctest.out zctest.in xlintstzc)
 endif()
-
-# ==============================================================================
-# Only run this test if python 2.7 or greater is found
-if(PYTHONINTERP_FOUND)
-  message(STATUS "Running Summary")
-  file(COPY ${LAPACK_SOURCE_DIR}/lapack_testing.py DESTINATION ${LAPACK_BINARY_DIR})
-  add_test(
-    NAME LAPACK_Test_Summary
-    WORKING_DIRECTORY ${LAPACK_BINARY_DIR}
-    COMMAND ${PYTHON_EXECUTABLE} "lapack_testing.py"
-    )
-endif()