From f9ea88b9bc3b1f366e589fa2f7ebc1514be820e9 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 27 May 2021 15:07:21 +0200
Subject: [PATCH] [ci] Cleanup ctest log files for passed tests.
---
scripts/cmake/GitSetup.cmake | 2 +-
scripts/cmake/test/AddTestTester.cmake | 4 ++--
scripts/cmake/test/AddTestWrapper.cmake | 6 +++++-
scripts/cmake/test/OgsTestWrapper.cmake | 6 +++++-
4 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/scripts/cmake/GitSetup.cmake b/scripts/cmake/GitSetup.cmake
index ebc1758a059..d7aa117ca15 100644
--- a/scripts/cmake/GitSetup.cmake
+++ b/scripts/cmake/GitSetup.cmake
@@ -19,7 +19,7 @@ if(NOT _IS_GIT_REPO)
if(_IS_GIT_REPO GREATER 0)
set(_IS_GIT_REPO FALSE CACHE INTERNAL "")
if(NOT DEFINED OGS_VERSION)
- if(DEFINED $ENV{CI})
+ if(DEFINED ENV{CI})
message(
FATAL_ERROR
"No git repository found at ${PROJECT_SOURCE_DIR}! "
diff --git a/scripts/cmake/test/AddTestTester.cmake b/scripts/cmake/test/AddTestTester.cmake
index 9d8fbb8a9ad..66f49bd57d9 100644
--- a/scripts/cmake/test/AddTestTester.cmake
+++ b/scripts/cmake/test/AddTestTester.cmake
@@ -59,8 +59,8 @@ foreach(cmd ${TESTER_COMMAND})
ECHO_OUTPUT_VARIABLE
ECHO_ERROR_VARIABLE
)
- file(WRITE ${LOG_FILE} ${OUTPUT})
if(NOT EXIT_CODE STREQUAL "0")
+ file(WRITE ${LOG_FILE} ${OUTPUT})
message(WARNING "Exit code: ${EXIT_CODE}; log file: ${LOG_FILE}")
set(TEST_FAILED TRUE)
endif()
@@ -77,8 +77,8 @@ foreach(cmd ${TESTER_COMMAND})
ECHO_OUTPUT_VARIABLE
ECHO_ERROR_VARIABLE
)
- file(WRITE ${LOG_FILE} ${OUTPUT})
if(NOT EXIT_CODE STREQUAL "0")
+ file(WRITE ${LOG_FILE} ${OUTPUT})
message(WARNING "Exit code: ${EXIT_CODE}; log file: ${LOG_FILE}")
set(TEST_FAILED TRUE)
endif()
diff --git a/scripts/cmake/test/AddTestWrapper.cmake b/scripts/cmake/test/AddTestWrapper.cmake
index 44ddbc76f65..96a7bb59db4 100644
--- a/scripts/cmake/test/AddTestWrapper.cmake
+++ b/scripts/cmake/test/AddTestWrapper.cmake
@@ -19,6 +19,10 @@ execute_process(
ERROR_FILE ${LOG_FILE}
)
-if(NOT EXIT_CODE STREQUAL "0")
+if(EXIT_CODE STREQUAL "0")
+ if(DEFINED ENV{CI})
+ file(REMOVE ${LOG_FILE})
+ endif()
+else()
message(FATAL_ERROR "Exit code: ${EXIT_CODE}; log file: ${LOG_FILE}")
endif()
diff --git a/scripts/cmake/test/OgsTestWrapper.cmake b/scripts/cmake/test/OgsTestWrapper.cmake
index a90dbea0810..e2dbdba8d8d 100644
--- a/scripts/cmake/test/OgsTestWrapper.cmake
+++ b/scripts/cmake/test/OgsTestWrapper.cmake
@@ -6,6 +6,10 @@ execute_process(
ERROR_FILE ${LOG_FILE}
)
-if(NOT EXIT_CODE STREQUAL "0")
+if(EXIT_CODE STREQUAL "0")
+ if(DEFINED ENV{CI})
+ file(REMOVE ${LOG_FILE})
+ endif()
+else()
message(FATAL_ERROR "Exit code: ${EXIT_CODE}; log file: ${LOG_FILE}")
endif()
--
GitLab