From c1f6ed50b73dd9068545c1844e1fcfabda03b97d Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 19 Nov 2020 18:14:21 +0100
Subject: [PATCH] all test output directories now set in Directories.cmake
---
Tests/Functional/Python/PyCore/CMakeLists.txt | 2 +-
Tests/Functional/Python/PyExamples/CMakeLists.txt | 2 +-
Tests/Functional/Python/PyPersistence/CMakeLists.txt | 2 +-
Tests/Functional/Python/Std/CMakeLists.txt | 2 +-
cmake/BornAgain/Directories.cmake | 7 +++++++
cmake/configurables/BATesting.h.in | 6 +++---
6 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/Tests/Functional/Python/PyCore/CMakeLists.txt b/Tests/Functional/Python/PyCore/CMakeLists.txt
index 2aec5681bc9..c7b1d79d163 100644
--- a/Tests/Functional/Python/PyCore/CMakeLists.txt
+++ b/Tests/Functional/Python/PyCore/CMakeLists.txt
@@ -2,7 +2,7 @@
# Tests/Functional/PyCore/scripts/CMakeLists.txt
############################################################################
-set(OUTPUT_DIR ${TEST_OUTPUT_DIR}/Python/PyCore)
+set(OUTPUT_DIR ${TEST_OUTPUT_DIR_PY_CORE})
file(MAKE_DIRECTORY ${OUTPUT_DIR})
set(PYCORE_REFERENCE_DIR ${TEST_REFERENCE_DIR}/Python)
diff --git a/Tests/Functional/Python/PyExamples/CMakeLists.txt b/Tests/Functional/Python/PyExamples/CMakeLists.txt
index e9ccbfb0e29..12014add4e6 100644
--- a/Tests/Functional/Python/PyExamples/CMakeLists.txt
+++ b/Tests/Functional/Python/PyExamples/CMakeLists.txt
@@ -5,7 +5,7 @@
#
###############################################################################
-set(output_dir ${TEST_OUTPUT_DIR}/Functional/Python/PyExamples)
+set(output_dir ${TEST_OUTPUT_DIR_PY_EXAMPLES})
file(MAKE_DIRECTORY ${output_dir})
file(GLOB sim_examples "${PY_EXAMPLES_DIR}/sim*/*.py")
diff --git a/Tests/Functional/Python/PyPersistence/CMakeLists.txt b/Tests/Functional/Python/PyPersistence/CMakeLists.txt
index a6ffbc81239..db85f10cc11 100644
--- a/Tests/Functional/Python/PyPersistence/CMakeLists.txt
+++ b/Tests/Functional/Python/PyPersistence/CMakeLists.txt
@@ -2,7 +2,7 @@
# Tests/Functional/PyCore/persistence/CMakeLists.txt
############################################################################
-set(OUTPUT_DIR ${TEST_OUTPUT_DIR}/Functional/Python/PyPersist)
+set(OUTPUT_DIR ${TEST_OUTPUT_DIR_PY_PERSIST}/PyPersist)
file(MAKE_DIRECTORY ${OUTPUT_DIR})
set(PYPERSIST_REFERENCE_DIR ${TEST_REFERENCE_DIR}/Python)
diff --git a/Tests/Functional/Python/Std/CMakeLists.txt b/Tests/Functional/Python/Std/CMakeLists.txt
index d769218f987..afc25e554a5 100644
--- a/Tests/Functional/Python/Std/CMakeLists.txt
+++ b/Tests/Functional/Python/Std/CMakeLists.txt
@@ -12,4 +12,4 @@ target_link_libraries(${test} BornAgainCore gtest)
gtest_discover_tests(${test} DISCOVERY_TIMEOUT 300 TEST_PREFIX Py.)
-file(MAKE_DIRECTORY ${TEST_OUTPUT_DIR}/Functional/Python/Std)
+file(MAKE_DIRECTORY ${TEST_OUTPUT_DIR_PY_STD})
diff --git a/cmake/BornAgain/Directories.cmake b/cmake/BornAgain/Directories.cmake
index 330836505a5..8eab1b847e5 100644
--- a/cmake/BornAgain/Directories.cmake
+++ b/cmake/BornAgain/Directories.cmake
@@ -26,7 +26,14 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
set(BUILD_VAR_DIR ${CMAKE_BINARY_DIR}/var)
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_CORE ${CMAKE_BINARY_DIR}/test_output/Core)
+set(TEST_OUTPUT_DIR_PY_EXAMPLES ${CMAKE_BINARY_DIR}/test_output/PyExamples)
+set(TEST_OUTPUT_DIR_PY_CORE ${CMAKE_BINARY_DIR}/test_output/PyCore)
+set(TEST_OUTPUT_DIR_PY_PERSIST ${CMAKE_BINARY_DIR}/test_output/PyPersist)
+set(TEST_OUTPUT_DIR_PY_STD ${CMAKE_BINARY_DIR}/test_output/PyStd)
+set(TEST_OUTPUT_DIR_STD ${CMAKE_BINARY_DIR}/test_output/Std)
configure_file("${CONFIGURABLES_DIR}/auto_README.in" "${CMAKE_SOURCE_DIR}/auto/README" @ONLY)
diff --git a/cmake/configurables/BATesting.h.in b/cmake/configurables/BATesting.h.in
index ea9403d824d..75f2a45ddb6 100644
--- a/cmake/configurables/BATesting.h.in
+++ b/cmake/configurables/BATesting.h.in
@@ -43,15 +43,15 @@ inline std::string TestOutDir()
}
inline std::string TestOutDir_Std()
{
- return "@TEST_OUTPUT_DIR@/Std";
+ return "@TEST_OUTPUT_DIR_STD@";
}
inline std::string TestOutDir_Core()
{
- return "@TEST_OUTPUT_DIR@/Core";
+ return "@TEST_OUTPUT_DIR_CORE@";
}
inline std::string TestOutDir_PyStd()
{
- return "@TEST_OUTPUT_DIR@/PyStd";
+ return "@TEST_OUTPUT_DIR_PY_STD@";
}
} // namespace BATesting
--
GitLab