From 6f455f29cc4534fd7c2458f29c37d58cfb13d29f Mon Sep 17 00:00:00 2001 From: siivonek Date: Tue, 16 Feb 2021 15:44:18 +0200 Subject: [PATCH] Add MINGW64 to define. Try to fix tsan test path error to suppressions.txt. --- .gitlab-ci.yml | 2 +- src/encmain.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d98c780d..7718df45 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,7 +32,7 @@ test-tsan: variables: CFLAGS: '-fsanitize=thread' # Temporarily suppress known errors or false positives. - TSAN_OPTIONS: 'suppressions=/builds/TIE/ultravideo/kvazaar/tests/tsan_suppressions.txt' + TSAN_OPTIONS: 'suppressions=/builds/cs/ultravideo/kvazaar/tests/tsan_suppressions.txt' test-ubsan: <<: *test-template diff --git a/src/encmain.c b/src/encmain.c index f8aaa899..96f49854 100644 --- a/src/encmain.c +++ b/src/encmain.c @@ -268,7 +268,7 @@ done: // This thread exit call causes problems with media auto-build suite // The environment compiles with MINGW using a different pthreads lib - #ifndef __MINGW32__ + #if !defined(__MINGW32__) || !defined(__MINGW64__) pthread_exit(NULL); #endif return NULL;