Merge branch 'correctCTestCommands' into 'develop'

Correct ctest commands which need setting environmental variables

See merge request !484

Tests/Examples/CMakeLists.txt

@@ -17,8 +17,8 @@ function(run_example example label)
     get_filename_component(EXAMPLE_NAME ${script_path} NAME_WE)
 
     set(test_name Example.run.${EXAMPLE_NAME})
-    add_test(${test_name}
-        env PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+    add_test(NAME ${test_name}
+        COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
         BORNAGAIN_EXAMPLE_DATA_DIR=${EXAMPLES_DIR}/data
         NOSHOW=TRUE
         ${Python3_EXECUTABLE} ${TOOL_DIR}/code/batch-plot.py
@@ -34,8 +34,8 @@ function(run_noplot example)
     get_filename_component(EXAMPLE_NAME ${script_path} NAME_WE)
 
     set(test_name Example.exec.${EXAMPLE_NAME})
-    add_test(${test_name}
-        env PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+    add_test(NAME ${test_name}
+        COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
         ${Python3_EXECUTABLE} ${script_path} ${TEST_OUTPUT_DIR_PY_EXAMPLES})
 endfunction()
 
@@ -51,7 +51,7 @@ function(test_example example tolerance)
 
     configure_file(PyPersistence.py.in ${example_mod} @ONLY)
 
-    add_test(${test_name} ${Python3_EXECUTABLE} -B ${example_mod})
+    add_test(NAME ${test_name} COMMAND ${Python3_EXECUTABLE} -B ${example_mod})
 endfunction()
 
 ####################################################################################################

Tests/Functional/PyCore/CMakeLists.txt

@@ -15,7 +15,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/utils.py ${OUTPUT_DIR}/utils.py @ONLY
 
 foreach(_test ${tests})
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${_test} ${OUTPUT_DIR}/${_test} COPYONLY)
-    add_test(PyCore.${_test}
-        env PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+    add_test(NAME PyCore.${_test}
+        COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
         ${Python3_EXECUTABLE} ${OUTPUT_DIR}/${_test})
 endforeach()

Tests/Functional/PyFit/CMakeLists.txt

@@ -9,7 +9,7 @@ file(GLOB tests RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.py)
 
 foreach(_test ${tests})
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${_test} ${output_dir}/${_test} COPYONLY)
-    add_test(PyFit.${_test}
-        env PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+    add_test(NAME PyFit.${_test}
+        COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
         ${Python3_EXECUTABLE} ${output_dir}/${_test})
 endforeach()