diff options
13 files changed, 18 insertions, 18 deletions
diff --git a/compiler-rt/test/asan/TestCases/Darwin/objc-odr.mm b/compiler-rt/test/asan/TestCases/Darwin/objc-odr.mm index 72bc39c80dd..c4c240ee419 100644 --- a/compiler-rt/test/asan/TestCases/Darwin/objc-odr.mm +++ b/compiler-rt/test/asan/TestCases/Darwin/objc-odr.mm @@ -16,7 +16,7 @@ void f() { } int main() { - NSLog(@"Hello world"); + fprintf(stderr,"Hello world"); } // CHECK-NOT: AddressSanitizer: odr-violation diff --git a/compiler-rt/test/asan/TestCases/Darwin/suppressions-darwin.cc b/compiler-rt/test/asan/TestCases/Darwin/suppressions-darwin.cc index 403d819706a..a177c4e17ec 100644 --- a/compiler-rt/test/asan/TestCases/Darwin/suppressions-darwin.cc +++ b/compiler-rt/test/asan/TestCases/Darwin/suppressions-darwin.cc @@ -4,6 +4,7 @@ // Check that suppressing the interceptor by name works. // RUN: echo "interceptor_name:memmove" > %t.supp +// RUN: echo "interceptor_name:memcpy" >> %t.supp // RUN: %env_asan_opts=suppressions='"%t.supp"' %run %t 2>&1 | FileCheck --check-prefix=CHECK-IGNORE %s // Check that suppressing by interceptor name works even without the symbolizer diff --git a/compiler-rt/test/tsan/Darwin/dispatch_main.mm b/compiler-rt/test/tsan/Darwin/dispatch_main.mm index 1bb611c8e5a..75887547c60 100644 --- a/compiler-rt/test/tsan/Darwin/dispatch_main.mm +++ b/compiler-rt/test/tsan/Darwin/dispatch_main.mm @@ -7,23 +7,23 @@ #import <Foundation/Foundation.h> int main() { - NSLog(@"Hello world"); + fprintf(stderr,"Hello world"); dispatch_queue_t q = dispatch_queue_create("my.queue", DISPATCH_QUEUE_SERIAL); dispatch_async(q, ^{ - NSLog(@"1"); + fprintf(stderr,"1"); }); dispatch_async(q, ^{ - NSLog(@"2"); + fprintf(stderr,"2"); }); dispatch_async(q, ^{ - NSLog(@"3"); + fprintf(stderr,"3"); dispatch_async(dispatch_get_main_queue(), ^{ - NSLog(@"Done."); + fprintf(stderr,"Done."); sleep(1); exit(0); }); diff --git a/compiler-rt/test/tsan/Darwin/gcd-async-norace.mm b/compiler-rt/test/tsan/Darwin/gcd-async-norace.mm index b987e00656f..a8174f9a3b8 100644 --- a/compiler-rt/test/tsan/Darwin/gcd-async-norace.mm +++ b/compiler-rt/test/tsan/Darwin/gcd-async-norace.mm @@ -1,5 +1,5 @@ // RUN: %clang_tsan %s -o %t -framework Foundation -// RUN: %run %t 2>&1 +// RUN: %env_tsan_opts=ignore_interceptors_accesses=1 %run %t 2>&1 #import <Foundation/Foundation.h> diff --git a/compiler-rt/test/tsan/Darwin/gcd-async-race.mm b/compiler-rt/test/tsan/Darwin/gcd-async-race.mm index 31163f97289..b83dc01330a 100644 --- a/compiler-rt/test/tsan/Darwin/gcd-async-race.mm +++ b/compiler-rt/test/tsan/Darwin/gcd-async-race.mm @@ -1,5 +1,5 @@ // RUN: %clang_tsan %s -o %t -framework Foundation -// RUN: %deflake %run %t 2>&1 +// RUN: %env_tsan_opts=ignore_interceptors_accesses=1 %deflake %run %t 2>&1 #import <Foundation/Foundation.h> diff --git a/compiler-rt/test/tsan/Darwin/gcd-groups-norace.mm b/compiler-rt/test/tsan/Darwin/gcd-groups-norace.mm index fb4d804ed8c..a73881dd772 100644 --- a/compiler-rt/test/tsan/Darwin/gcd-groups-norace.mm +++ b/compiler-rt/test/tsan/Darwin/gcd-groups-norace.mm @@ -1,5 +1,5 @@ // RUN: %clang_tsan %s -o %t -framework Foundation -// RUN: %run %t 2>&1 +// RUN: %env_tsan_opts=ignore_interceptors_accesses=1 %run %t 2>&1 #import <Foundation/Foundation.h> diff --git a/compiler-rt/test/tsan/Darwin/gcd-groups-stress.mm b/compiler-rt/test/tsan/Darwin/gcd-groups-stress.mm index 9ed85bdfe82..96a20f4e011 100644 --- a/compiler-rt/test/tsan/Darwin/gcd-groups-stress.mm +++ b/compiler-rt/test/tsan/Darwin/gcd-groups-stress.mm @@ -1,5 +1,5 @@ // RUN: %clang_tsan %s -o %t -framework Foundation -// RUN: %run %t 2>&1 +// RUN: %env_tsan_opts=ignore_interceptors_accesses=1 %run %t 2>&1 #import <Foundation/Foundation.h> diff --git a/compiler-rt/test/tsan/Darwin/gcd-once.mm b/compiler-rt/test/tsan/Darwin/gcd-once.mm index 17757d20375..4546761ac10 100644 --- a/compiler-rt/test/tsan/Darwin/gcd-once.mm +++ b/compiler-rt/test/tsan/Darwin/gcd-once.mm @@ -1,5 +1,5 @@ // RUN: %clang_tsan %s -o %t -framework Foundation -// RUN: %run %t 2>&1 +// RUN: %env_tsan_opts=ignore_interceptors_accesses=1 %run %t 2>&1 #import <Foundation/Foundation.h> diff --git a/compiler-rt/test/tsan/Darwin/gcd-semaphore-norace.mm b/compiler-rt/test/tsan/Darwin/gcd-semaphore-norace.mm index cd52a79ca65..c7280b26f77 100644 --- a/compiler-rt/test/tsan/Darwin/gcd-semaphore-norace.mm +++ b/compiler-rt/test/tsan/Darwin/gcd-semaphore-norace.mm @@ -1,5 +1,5 @@ // RUN: %clang_tsan %s -o %t -framework Foundation -// RUN: %run %t 2>&1 +// RUN: %env_tsan_opts=ignore_interceptors_accesses=1 %run %t 2>&1 #import <Foundation/Foundation.h> diff --git a/compiler-rt/test/tsan/Darwin/gcd-serial-queue-norace.mm b/compiler-rt/test/tsan/Darwin/gcd-serial-queue-norace.mm index 8f6de27695a..a6b47abd7a6 100644 --- a/compiler-rt/test/tsan/Darwin/gcd-serial-queue-norace.mm +++ b/compiler-rt/test/tsan/Darwin/gcd-serial-queue-norace.mm @@ -1,5 +1,5 @@ // RUN: %clang_tsan %s -o %t -framework Foundation -// RUN: %run %t 2>&1 +// RUN: %env_tsan_opts=ignore_interceptors_accesses=1 %run %t 2>&1 #import <Foundation/Foundation.h> diff --git a/compiler-rt/test/tsan/Darwin/gcd-sync-norace.mm b/compiler-rt/test/tsan/Darwin/gcd-sync-norace.mm index f21cfdedbce..b820e0a943c 100644 --- a/compiler-rt/test/tsan/Darwin/gcd-sync-norace.mm +++ b/compiler-rt/test/tsan/Darwin/gcd-sync-norace.mm @@ -1,5 +1,5 @@ // RUN: %clang_tsan %s -o %t -framework Foundation -// RUN: %run %t 2>&1 +// RUN: %env_tsan_opts=ignore_interceptors_accesses=1 %run %t 2>&1 #import <Foundation/Foundation.h> diff --git a/compiler-rt/test/tsan/Darwin/gcd-sync-race.mm b/compiler-rt/test/tsan/Darwin/gcd-sync-race.mm index 62901d9b261..6fc568dc315 100644 --- a/compiler-rt/test/tsan/Darwin/gcd-sync-race.mm +++ b/compiler-rt/test/tsan/Darwin/gcd-sync-race.mm @@ -1,5 +1,5 @@ // RUN: %clang_tsan %s -o %t -framework Foundation -// RUN: %deflake %run %t 2>&1 +// RUN: %env_tsan_opts=ignore_interceptors_accesses=1 %deflake %run %t 2>&1 #import <Foundation/Foundation.h> diff --git a/compiler-rt/test/tsan/Darwin/ignored-interceptors.mm b/compiler-rt/test/tsan/Darwin/ignored-interceptors.mm index 8a4ecf1eed4..82b95151f4a 100644 --- a/compiler-rt/test/tsan/Darwin/ignored-interceptors.mm +++ b/compiler-rt/test/tsan/Darwin/ignored-interceptors.mm @@ -33,11 +33,10 @@ void *Thread2(void *x) { } int main(int argc, char *argv[]) { - NSLog(@"Hello world."); + fprintf(stderr, "Hello world.\n"); // NSUserDefaults uses XPC which triggers the false positive. NSDictionary *d = [[NSUserDefaults standardUserDefaults] dictionaryRepresentation]; - NSLog(@"d = %@", d); if (argc > 1 && strcmp(argv[1], "race") == 0) { barrier_init(&barrier, 2); @@ -48,7 +47,7 @@ int main(int argc, char *argv[]) { pthread_join(t[1], NULL); } - NSLog(@"Done."); + fprintf(stderr, "Done.\n"); } // CHECK: Hello world. |
