From 4ad4b179914fa7bff09a4fdc823826ca12581f55 Mon Sep 17 00:00:00 2001 From: FritzFlorian Date: Tue, 19 Mar 2019 20:32:29 +0100 Subject: [PATCH] Change back to display sanitizer logs in console. We do this as we can not read them properly online as a artifact without downloading. --- .gitlab-ci.yml | 3 --- ci_scripts/run_thread_sanitizer.sh | 8 +------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 641bdd1..5211d8d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,6 +22,3 @@ run_thread_sanitizer: stage: sanitizer script: ./ci_scripts/run_thread_sanitizer.sh - artifacts: - paths: - - thread-sanitizer.log diff --git a/ci_scripts/run_thread_sanitizer.sh b/ci_scripts/run_thread_sanitizer.sh index b2de4c3..0664c0c 100755 --- a/ci_scripts/run_thread_sanitizer.sh +++ b/ci_scripts/run_thread_sanitizer.sh @@ -6,13 +6,7 @@ cmake .. -DCMAKE_BUILD_TYPE=RELEASE -DTHREAD_SANITIZER=ON make # run the actual tests with sanitizer enabled, reporting the result -TSAN_OPTIONS="log_path=sanitizer.log exitcode=1" ./bin/tests +TSAN_OPTIONS="exitcode=1" ./bin/tests STATUS_CODE=$? -# rename the output log... -mv ./sanitizer.log.* ../thread-sanitizer.log -if [[ $? != 0 ]]; then - echo "No sanitizer warnings." > ../thread-sanitizer.log -fi - exit $STATUS_CODE -- libgit2 0.26.0