Add MINGW64 to define. Try to fix tsan test path error to suppression…

…s.txt.
ultravideo · Feb 16, 2021 · 6f455f2 · 6f455f2
1 parent 9a65617
commit 6f455f2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -268,7 +268,7 @@ static void* input_read_thread(void* in_args)
 
   // 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;