From 2ba2e8354a1aed67e2d594a53f7b177cec675bac Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 29 Sep 2021 14:58:35 +0200
Subject: [PATCH] [ctest] Changed log file extension from .log to .txt.
Should fix CI artifact rendering in the browser.
See https://gitlab.com/gitlab-org/gitlab/-/issues/211517.
---
scripts/ci/extends/template-build-linux.yml | 2 +-
scripts/ci/extends/template-build-win.yml | 2 +-
scripts/ci/extends/test-artifacts.yml | 4 ++--
scripts/ci/jobs/clang-tidy.yml | 6 +++---
scripts/cmake/test/AddTest.cmake | 8 ++++----
scripts/cmake/test/AddTestTester.cmake | 4 ++--
scripts/cmake/test/OgsTest.cmake | 2 +-
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/scripts/ci/extends/template-build-linux.yml b/scripts/ci/extends/template-build-linux.yml
index 2a6c3abbe47..e4c20a6f4be 100644
--- a/scripts/ci/extends/template-build-linux.yml
+++ b/scripts/ci/extends/template-build-linux.yml
@@ -7,7 +7,7 @@
before_script:
- 'echo "For debugging run: docker run --rm -it -v $CI_BUILDS_DIR:/builds -w=$CI_PROJECT_DIR $CI_JOB_IMAGE"'
- build_dir_full=../build/${CMAKE_PRESET}
- - log_file=$build_dir_full/make.output
+ - log_file=$build_dir_full/make.txt
- rm -rf $build_dir_full
- mkdir -p $build_dir_full build
- if [[ "$OSTYPE" == "darwin"* ]] ; then readlink_cmd=greadlink; else readlink_cmd=readlink; fi
diff --git a/scripts/ci/extends/template-build-win.yml b/scripts/ci/extends/template-build-win.yml
index 55c4fe9c953..5cf79488675 100644
--- a/scripts/ci/extends/template-build-win.yml
+++ b/scripts/ci/extends/template-build-win.yml
@@ -9,7 +9,7 @@
variables:
script:
- $build_directory_full = "..\build\" + $env:CMAKE_PRESET
- - $log_file = $build_directory_full + "\make.output"
+ - $log_file = $build_directory_full + "\make.txt"
- (rm -r -fo $build_directory_full)
- cmd /c if not exist $build_directory_full mkdir $build_directory_full
- mkdir build
diff --git a/scripts/ci/extends/test-artifacts.yml b/scripts/ci/extends/test-artifacts.yml
index ffe88323e80..3f750095af1 100644
--- a/scripts/ci/extends/test-artifacts.yml
+++ b/scripts/ci/extends/test-artifacts.yml
@@ -2,10 +2,10 @@
artifacts:
when: always
paths:
- - build/*/logs/*.log
+ - build/*/logs/*.txt
- build/*/Tests/ctest-junit.xml
- build/*/Tests/testrunner.xml
- - build/*/make.output
+ - build/*/make.txt
- build/*/*.zip
- build/*/*.tar.gz
expire_in: 1 week
diff --git a/scripts/ci/jobs/clang-tidy.yml b/scripts/ci/jobs/clang-tidy.yml
index 2a44565fdf5..c97339369f8 100644
--- a/scripts/ci/jobs/clang-tidy.yml
+++ b/scripts/ci/jobs/clang-tidy.yml
@@ -2,7 +2,7 @@ clang tidy:
stage: check
extends:
- .rules-manual
- needs: [ ci_images ]
+ needs: [ci_images]
variables:
BUILD_DIR: "../build/tidy"
CMAKE_ARGS: "-DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=OFF -DCMAKE_CXX_CLANG_TIDY=clang-tidy-9"
@@ -16,9 +16,9 @@ clang tidy:
$CMAKE_ARGS
-DCMAKE_BUILD_TYPE=$BUILD_TYPE
-DOGS_BUILD_PROCESSES=$BUILD_PROCESSES
- - cmake --build . > >(tee make.output)
+ - cmake --build . > >(tee make.txt)
artifacts:
# No report yet: https://gitlab.com/gitlab-org/gitlab/-/issues/3985
paths:
- - $BUILD_DIR/make.output
+ - $BUILD_DIR/make.txt
expire_in: 1 week
diff --git a/scripts/cmake/test/AddTest.cmake b/scripts/cmake/test/AddTest.cmake
index a3c12791d19..9e6fa192f53 100644
--- a/scripts/cmake/test/AddTest.cmake
+++ b/scripts/cmake/test/AddTest.cmake
@@ -87,7 +87,7 @@ function(AddTest)
file(MAKE_DIRECTORY ${AddTest_BINARY_PATH})
file(TO_NATIVE_PATH "${AddTest_BINARY_PATH}" AddTest_BINARY_PATH_NATIVE)
set(AddTest_STDOUT_FILE_PATH
- "${AddTest_BINARY_PATH}/${AddTest_NAME}_stdout.log"
+ "${AddTest_BINARY_PATH}/${AddTest_NAME}_stdout.txt"
)
# set defaults
@@ -157,7 +157,7 @@ function(AddTest)
elseif(AddTest_WRAPPER STREQUAL "memcheck")
if(VALGRIND_TOOL_PATH)
set(WRAPPER_COMMAND
- "${VALGRIND_TOOL_PATH} --tool=memcheck --log-file=${AddTest_SOURCE_PATH}/${AddTest_NAME}_memcheck.log -v --leak-check=full --show-reachable=yes --track-origins=yes --malloc-fill=0xff --free-fill=0xff"
+ "${VALGRIND_TOOL_PATH} --tool=memcheck --log-file=${AddTest_SOURCE_PATH}/${AddTest_NAME}_memcheck.txt -v --leak-check=full --show-reachable=yes --track-origins=yes --malloc-fill=0xff --free-fill=0xff"
)
set(tester memcheck)
else()
@@ -373,7 +373,7 @@ Use six arguments version of AddTest with absolute and relative tolerances"
endforeach()
elseif(AddTest_TESTER STREQUAL "memcheck")
set(TESTER_COMMAND
- "! ${GREP_TOOL_PATH} definitely ${AddTest_SOURCE_PATH}/${AddTest_NAME}_memcheck.log"
+ "! ${GREP_TOOL_PATH} definitely ${AddTest_SOURCE_PATH}/${AddTest_NAME}_memcheck.txt"
)
endif()
@@ -403,7 +403,7 @@ Use six arguments version of AddTest with absolute and relative tolerances"
"-DWRAPPER_ARGS=${AddTest_WRAPPER_ARGS}"
"-DFILES_TO_DELETE=${FILES_TO_DELETE}"
-DWORKING_DIRECTORY=${AddTest_WORKING_DIRECTORY}
- -DLOG_FILE=${PROJECT_BINARY_DIR}/logs/${TEST_NAME}.log
+ -DLOG_FILE=${PROJECT_BINARY_DIR}/logs/${TEST_NAME}.txt
-P
${PROJECT_SOURCE_DIR}/scripts/cmake/test/AddTestWrapper.cmake
)
diff --git a/scripts/cmake/test/AddTestTester.cmake b/scripts/cmake/test/AddTestTester.cmake
index c510ea21473..01953027cc8 100644
--- a/scripts/cmake/test/AddTestTester.cmake
+++ b/scripts/cmake/test/AddTestTester.cmake
@@ -45,7 +45,7 @@ foreach(cmd ${TESTER_COMMAND})
endif()
foreach(file ${FILES})
math(EXPR _counter "${_counter}+1")
- set(LOG_FILE ${LOG_FILE_BASE}-${_counter}.log)
+ set(LOG_FILE ${LOG_FILE_BASE}-${_counter}.txt)
if("$ENV{HOSTNAME}" MATCHES "frontend.*")
string(REPLACE "gpfs1" "../.." file ${file})
endif()
@@ -72,7 +72,7 @@ foreach(cmd ${TESTER_COMMAND})
endforeach()
else()
math(EXPR _counter "${_counter}+1")
- set(LOG_FILE ${LOG_FILE_BASE}-${_counter}.log)
+ set(LOG_FILE ${LOG_FILE_BASE}-${_counter}.txt)
execute_process(
COMMAND ${TERMINAL_CMD} "${cmd}"
WORKING_DIRECTORY ${SOURCE_PATH}
diff --git a/scripts/cmake/test/OgsTest.cmake b/scripts/cmake/test/OgsTest.cmake
index 29ff47437a9..e4d2fdfe633 100644
--- a/scripts/cmake/test/OgsTest.cmake
+++ b/scripts/cmake/test/OgsTest.cmake
@@ -63,7 +63,7 @@ function(OgsTest)
"-DEXECUTABLE_ARGS=${_exe_args}"
"-DWRAPPER_COMMAND=${OgsTest_WRAPPER}"
-DWORKING_DIRECTORY=${OgsTest_BINARY_DIR}
- -DLOG_FILE=${PROJECT_BINARY_DIR}/logs/${TEST_NAME_UNDERSCORE}.log
+ -DLOG_FILE=${PROJECT_BINARY_DIR}/logs/${TEST_NAME_UNDERSCORE}.txt
-P ${PROJECT_SOURCE_DIR}/scripts/cmake/test/OgsTestWrapper.cmake
)
--
GitLab