redirect some test output; rm some variables

Tests/Examples/CMakeLists.txt

@@ -5,7 +5,8 @@
 # - under target 'figures', generate high-resolution figures for hugo
 # - under target 'excopy', copy example sources to hugo
 
-file(MAKE_DIRECTORY ${TEST_OUTPUT_DIR_PY_PERSIST})
+set(OUTPUT_DIR ${TEST_OUTPUT_DIR}/MiniExamples)
+file(MAKE_DIRECTORY ${OUTPUT_DIR})
 
 set(FIG_DIR ${CMAKE_SOURCE_DIR}/hugo/static/img/auto)
 
@@ -14,7 +15,7 @@ add_custom_target(manualtest)
 
 file(MAKE_DIRECTORY ${FIG_DIR})
 foreach(subdir ff fq offspec scatter2d specular varia)
-    file(MAKE_DIRECTORY ${TEST_OUTPUT_DIR_PY_PERSIST}/${subdir})
+    file(MAKE_DIRECTORY ${OUTPUT_DIR}/${subdir})
     file(MAKE_DIRECTORY ${FIG_DIR}/${subdir})
 endforeach()
 
@@ -63,7 +64,7 @@ endfunction()
 # Register example with target 'manualtest'.
 function(run_manually example)
     parse_example(${example})
-    string(REPLACE "/" "." TARGET_NAME Example.${example}.run)
+    string(REPLACE "/" "." TARGET_NAME Example.${example}.manualtest)
     add_custom_target(${TARGET_NAME}
         COMMAND echo "### MANUAL TEST: EXAMPLE ${EXAMPLE_NAME}"
         ${launch_env} ${launch_py} ${MINI_SCRIPT}
@@ -74,8 +75,8 @@ endfunction()
 # Register example that plots and has persistence test.
 function(test_equality example reference tolerance)
     parse_example(${example})
-    string(REPLACE "/" "." TARGET_NAME Example.${example}.fig)
-    cmake_path(SET outfile NORMALIZE ${TEST_OUTPUT_DIR_PY_PERSIST}/${example})
+    string(REPLACE "/" "." TARGET_NAME Example.${example}.persist)
+    cmake_path(SET outfile NORMALIZE ${OUTPUT_DIR}/${example})
     cmake_path(SET reffile NORMALIZE ${REFERENCE_DIR_MINIEXAMPLES}/${reference})
     add_test(NAME ${TARGET_NAME}
         ${launch_env} ${launch_py} ${MINI_SCRIPT} show=n datfile=${outfile}

Tests/Py/Fit/CMakeLists.txt

@@ -5,14 +5,15 @@
 # The Python scripts in this directory contain unit tests
 # of the Python API of fit related classes from C++ source directory Fit.
 
-set(output_dir ${TEST_OUTPUT_DIR_PY_FIT})
-file(MAKE_DIRECTORY ${output_dir})
+set(OUTPUT_DIR ${TEST_OUTPUT_DIR}/PyFit)
+file(MAKE_DIRECTORY ${OUTPUT_DIR})
 
 file(GLOB tests RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.py)
 
 foreach(_test ${tests})
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${_test} ${output_dir}/${_test} COPYONLY)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${_test} ${OUTPUT_DIR}/${_test} COPYONLY)
     add_test(NAME Py.Fit.${_test}
+        WORKING_DIRECTORY ${OUTPUT_DIR}
         COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
-        ${Python3_EXECUTABLE} ${output_dir}/${_test})
+        ${Python3_EXECUTABLE} ${OUTPUT_DIR}/${_test})
 endforeach()

Tests/Py/Functional/CMakeLists.txt

@@ -2,7 +2,7 @@
  # BornAgain/Tests/Py/Varia/CMakeLists.txt
 ############################################################################
 
-set(OUTPUT_DIR ${TEST_OUTPUT_DIR_PY_CORE})
+set(OUTPUT_DIR ${TEST_OUTPUT_DIR}/PyFu)
 file(MAKE_DIRECTORY ${OUTPUT_DIR})
 
 set(infrastructure PyFuTestInfrastructure.py)
@@ -15,6 +15,7 @@ endforeach()
 foreach(_test ${tests})
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${_test} ${OUTPUT_DIR}/${_test} COPYONLY)
     add_test(NAME Py.Functional.${_test}
+        WORKING_DIRECTORY ${OUTPUT_DIR}
         COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
         ${Python3_EXECUTABLE} ${OUTPUT_DIR}/${_test})
 endforeach()

Tests/Py/Unit/CMakeLists.txt

@@ -2,7 +2,7 @@
  # BornAgain/Tests/Py/Varia/CMakeLists.txt
 ############################################################################
 
-set(OUTPUT_DIR ${TEST_OUTPUT_DIR_PY_CORE})
+set(OUTPUT_DIR ${TEST_OUTPUT_DIR}/PyUnit)
 file(MAKE_DIRECTORY ${OUTPUT_DIR})
 
 file(GLOB tests RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.py)
@@ -13,6 +13,7 @@ endif()
 foreach(_test ${tests})
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${_test} ${OUTPUT_DIR}/${_test} COPYONLY)
     add_test(NAME Py.Unit.${_test}
+        WORKING_DIRECTORY ${OUTPUT_DIR}
         COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
         ${Python3_EXECUTABLE} ${OUTPUT_DIR}/${_test})
 endforeach()

cmake/BornAgain/Directories.cmake

@@ -41,9 +41,6 @@ set(BUILD_INC_DIR ${CMAKE_BINARY_DIR}/inc)
 set(BUILD_SRC_DIR ${CMAKE_BINARY_DIR}/src)
 
 set(TEST_OUTPUT_DIR             ${CMAKE_BINARY_DIR}/test_output)
-set(TEST_OUTPUT_DIR_PY_CORE     ${TEST_OUTPUT_DIR}/PyCore)
-set(TEST_OUTPUT_DIR_PY_FIT      ${TEST_OUTPUT_DIR}/PyFit)
-set(TEST_OUTPUT_DIR_PY_PERSIST  ${TEST_OUTPUT_DIR}/PyPersist)
 set(TEST_OUTPUT_DIR_SUITE       ${TEST_OUTPUT_DIR}/Suite)
 
 configure_file("${CONFIGURABLES_DIR}/auto_README.in.md" "${CMAKE_SOURCE_DIR}/auto/README.md" @ONLY)
@@ -54,6 +51,7 @@ file(MAKE_DIRECTORY ${BUILD_VAR_DIR})
 file(MAKE_DIRECTORY ${BUILD_INC_DIR})
 file(MAKE_DIRECTORY ${BUILD_SRC_DIR})
 file(MAKE_DIRECTORY ${TEST_OUTPUT_DIR})
+file(MAKE_DIRECTORY ${TEST_OUTPUT_DIR_SUITE})
 
 # -----------------------------------------------------------------------------
 # file extensions