Index: test/tsan/race_on_mutex.c =================================================================== --- test/tsan/race_on_mutex.c +++ test/tsan/race_on_mutex.c @@ -2,10 +2,6 @@ // This test fails when run on powerpc64 (VMA=46). // The size of the write reported by Tsan for T1 is 8 instead of 1. // XFAIL: powerpc64 -// This test expects pthread_mutex_init in the frame #0 of thread T1 but we -// get memset at frame #0 because memset that is called from pthread_init_mutex -// is being intercepted by TSan -// XFAIL: mips64 #include "test.h" pthread_mutex_t Mtx; @@ -24,9 +20,9 @@ } void *Thread1(void *x) { -// CHECK: Previous write of size 1 at {{.*}} by thread T1: -// CHECK-NEXT: #0 pthread_mutex_init {{.*}} ({{.*}}) -// CHECK-NEXT: #1 Thread1{{.*}} {{.*}}race_on_mutex.c:[[@LINE+1]]{{(:3)?}} ({{.*}}) +// CHECK: Previous write of size {{[0-9]+}} at {{.*}} by thread T1: +// CHECK: #{{[0-9]+}} {{.*}}pthread_mutex_init {{.*}} ({{.*}}) +// CHECK-NEXT: #{{[0-9]+}} Thread1{{.*}} {{.*}}race_on_mutex.c:[[@LINE+1]]{{(:3)?}} ({{.*}}) pthread_mutex_init(&Mtx, 0); pthread_mutex_lock(&Mtx); Global = 42;