Loading...
--- libmalloc/libmalloc-792.60.6/tests/tsan.c
+++ libmalloc/libmalloc-166.220.1/tests/tsan.c
@@ -2,9 +2,6 @@
 #include <dlfcn.h>
 #include <pthread.h>
 #include <stdlib.h>
-
-T_GLOBAL_META(T_META_RUN_CONCURRENTLY(true), T_META_TAG_VM_PREFERRED,
-		T_META_TAG_NO_ALLOCATOR_OVERRIDE);
 
 T_DECL(tsan_sanity, "TSan Sanity Check", T_META_CHECK_LEAKS(NO))
 {
@@ -30,12 +27,10 @@
 char *tsan_description = NULL;
 invisible_barrier_t barrier;
 
-__attribute__((weak))
 const char *__tsan_default_options() {
 	return "abort_on_error=0:exitcode=0";
 }
 
-__attribute__((weak))
 void __tsan_on_report(void *report) {
 	tsan_report_hit = true;
 
@@ -76,7 +71,7 @@
 	pthread_join(t2, NULL);
 	pthread_join(t1, NULL);
 
-	T_ASSERT_EQ(tsan_report_hit, true, "tsan finds data-race");
+	T_EXPECT_EQ(tsan_report_hit, true, "tsan finds data-race");
 	T_EXPECT_NOTNULL(strstr(tsan_description, "data-race"), "tsan header");
 }
 
@@ -94,6 +89,6 @@
 	pthread_join(t2, NULL);
 	pthread_join(t1, NULL);
 
-	T_ASSERT_EQ(tsan_report_hit, true, "tsan finds data-race");
+	T_EXPECT_EQ(tsan_report_hit, true, "tsan finds data-race");
 	T_EXPECT_NOTNULL(strstr(tsan_description, "data-race"), "tsan header");
 }