This is an archive of the discontinued LLVM Phabricator instance.

Differential D18503

[tsan] Fix Darwin tests (missing FileCheck's)
ClosedPublic

Authored by kubamracek on Mar 27 2016, 2:11 PM.

Details

Reviewers
kcc
glider
dvyukov
samsonov
Commits
rGaafb41ae4735: [tsan] Fix Darwin tests (missing FileCheck's)
rCRT265658: [tsan] Fix Darwin tests (missing FileCheck's)
rL265658: [tsan] Fix Darwin tests (missing FileCheck's)
Summary

A little embarrassing, but we're missing the call to FileCheck in several Darwin tests. Let's fix this.

Diff Detail

Event Timeline

kubamracek updated this revision to Diff 51749.Mar 27 2016, 2:11 PM
kubamracek retitled this revision from to [tsan] Fix Darwin tests (missing FileCheck's).
kubamracek updated this object.
kubamracek added reviewers: dvyukov, glider, samsonov, kcc.
kubamracek added subscribers: llvm-commits, zaks.anna, dcoughlin.
glider accepted this revision.Mar 31 2016, 10:05 AM
glider edited edge metadata.
This revision is now accepted and ready to land.Mar 31 2016, 10:05 AM
Closed by commit rL265658: [tsan] Fix Darwin tests (missing FileCheck's) (authored by kuba.brecka). · Explain WhyApr 7 2016, 4:36 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 51749

test/tsan/Darwin/gcd-async-norace.mm

// RUN: %clang_tsan %s -o %t -framework Foundation // RUN: %clang_tsan %s -o %t -framework Foundation
// RUN: %run %t 2>&1 // RUN: %run %t 2>&1 | FileCheck %s
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
long global; long global;
int main() { int main() {
NSLog(@"Hello world."); NSLog(@"Hello world.");
Show All 16 Lines

test/tsan/Darwin/gcd-async-race.mm

// RUN: %clang_tsan %s -o %t -framework Foundation // RUN: %clang_tsan %s -o %t -framework Foundation
// RUN: %deflake %run %t 2>&1 // RUN: %deflake %run %t 2>&1 | FileCheck %s
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "../test.h" #import "../test.h"
long global; long global;
int main() { int main() {
NSLog(@"Hello world."); NSLog(@"Hello world.");
NSLog(@"addr=%p\n", &global); print_address("addr=", 1, &global);
barrier_init(&barrier, 2); barrier_init(&barrier, 2);
global = 42; global = 42;
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
global = 43; global = 43;
barrier_wait(&barrier); barrier_wait(&barrier);
}); });
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
barrier_wait(&barrier); barrier_wait(&barrier);
global = 44; global = 44;
dispatch_sync(dispatch_get_main_queue(), ^{ dispatch_sync(dispatch_get_main_queue(), ^{
CFRunLoopStop(CFRunLoopGetCurrent()); CFRunLoopStop(CFRunLoopGetCurrent());
}); });
}); });
CFRunLoopRun(); CFRunLoopRun();
NSLog(@"Done."); NSLog(@"Done.");
} }
// CHECK: Hello world. // CHECK: Hello world.
// CHECK: addr=[[ADDR:0x[0-9,a-f]+]] // CHECK: addr=[[ADDR:0x[0-9,a-f]+]]
// CHECK: WARNING: ThreadSanitizer: data race // CHECK: WARNING: ThreadSanitizer: data race
// CHECK: Location is global 'global' at [[ADDR]] (global_race.cc.exe+0x{{[0-9,a-f]+}}) // CHECK: Location is global 'global' {{(of size 8 )?}}at [[ADDR]] (gcd-async-race.mm.tmp+0x{{[0-9,a-f]+}})
// CHECK: Done. // CHECK: Done.

test/tsan/Darwin/gcd-groups-norace.mm

// RUN: %clang_tsan %s -o %t -framework Foundation // RUN: %clang_tsan %s -o %t -framework Foundation
// RUN: %run %t 2>&1 // RUN: %run %t 2>&1 | FileCheck %s
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "../test.h" #import "../test.h"
long global; long global;
int main() { int main() {
▲ Show 20 Lines • Show All 43 Lines • Show Last 20 Lines

test/tsan/Darwin/gcd-groups-stress.mm

// RUN: %clang_tsan %s -o %t -framework Foundation // RUN: %clang_tsan %s -o %t -framework Foundation
// RUN: %run %t 2>&1 // RUN: %run %t 2>&1 | FileCheck %s
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
void notify_callback(void *context) { void notify_callback(void *context) {
// Do nothing. // Do nothing.
} }
int main() { int main() {
Show All 33 Lines

test/tsan/Darwin/gcd-once.mm

// RUN: %clang_tsan %s -o %t -framework Foundation // RUN: %clang_tsan %s -o %t -framework Foundation
// RUN: %run %t 2>&1 // RUN: %run %t 2>&1 | FileCheck %s
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "../test.h" #import "../test.h"
static const long kNumThreads = 4; static const long kNumThreads = 4;
long global; long global;
▲ Show 20 Lines • Show All 45 Lines • Show Last 20 Lines

test/tsan/Darwin/gcd-semaphore-norace.mm

// RUN: %clang_tsan %s -o %t -framework Foundation // RUN: %clang_tsan %s -o %t -framework Foundation
// RUN: %run %t 2>&1 // RUN: %run %t 2>&1 | FileCheck %s
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
long global; long global;
int main() { int main() {
NSLog(@"Hello world."); NSLog(@"Hello world.");
Show All 19 Lines

test/tsan/Darwin/gcd-serial-queue-norace.mm

// RUN: %clang_tsan %s -o %t -framework Foundation // RUN: %clang_tsan %s -o %t -framework Foundation
// RUN: %run %t 2>&1 // RUN: %run %t 2>&1 | FileCheck %s
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "../test.h" #import "../test.h"
long global; long global;
int main() { int main() {
Show All 30 Lines

test/tsan/Darwin/gcd-sync-norace.mm

// RUN: %clang_tsan %s -o %t -framework Foundation // RUN: %clang_tsan %s -o %t -framework Foundation
// RUN: %run %t 2>&1 // RUN: %run %t 2>&1 | FileCheck %s
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
long global; long global;
static const long nIter = 1000; static const long nIter = 1000;
int main() { int main() {
Show All 22 Lines

test/tsan/Darwin/gcd-sync-race.mm

// RUN: %clang_tsan %s -o %t -framework Foundation // RUN: %clang_tsan %s -o %t -framework Foundation
// RUN: %deflake %run %t 2>&1 // RUN: %deflake %run %t 2>&1 | FileCheck %s
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "../test.h" #import "../test.h"
long global; long global;
int main() { int main() {
NSLog(@"Hello world."); NSLog(@"Hello world.");
NSLog(@"addr=%p\n", &global); print_address("addr=", 1, &global);
barrier_init(&barrier, 2); barrier_init(&barrier, 2);
dispatch_queue_t q1 = dispatch_queue_create("my.queue1", DISPATCH_QUEUE_CONCURRENT); dispatch_queue_t q1 = dispatch_queue_create("my.queue1", DISPATCH_QUEUE_CONCURRENT);
dispatch_queue_t q2 = dispatch_queue_create("my.queue2", DISPATCH_QUEUE_CONCURRENT); dispatch_queue_t q2 = dispatch_queue_create("my.queue2", DISPATCH_QUEUE_CONCURRENT);
global = 42; global = 42;
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
dispatch_sync(q1, ^{ dispatch_sync(q1, ^{
Show All 14 Linesint main() {
CFRunLoopRun(); CFRunLoopRun();
NSLog(@"Done."); NSLog(@"Done.");
} }
// CHECK: Hello world. // CHECK: Hello world.
// CHECK: addr=[[ADDR:0x[0-9,a-f]+]] // CHECK: addr=[[ADDR:0x[0-9,a-f]+]]
// CHECK: WARNING: ThreadSanitizer: data race // CHECK: WARNING: ThreadSanitizer: data race
// CHECK: Location is global 'global' at [[ADDR]] (global_race.cc.exe+0x{{[0-9,a-f]+}}) // CHECK: Location is global 'global' {{(of size 8 )?}}at [[ADDR]] (gcd-sync-race.mm.tmp+0x{{[0-9,a-f]+}})
// CHECK: Done. // CHECK: Done.

test/tsan/Darwin/objc-race.mm

// RUN: %clang_tsan %s -o %t -framework Foundation // RUN: %clang_tsan %s -o %t -framework Foundation
// RUN: %deflake %run %t 2>&1 // RUN: %deflake %run %t 2>&1 | FileCheck %s
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "../test.h" #import "../test.h"
@interface MyClass : NSObject { @interface MyClass : NSObject {
long instance_variable; long instance_variable;
} }
Show All 33 Linesint main() {
NSLog(@"Done."); NSLog(@"Done.");
return 0; return 0;
} }
// CHECK: Hello world. // CHECK: Hello world.
// CHECK: WARNING: ThreadSanitizer: data race // CHECK: WARNING: ThreadSanitizer: data race
// CHECK: Write of size 8 // CHECK: Write of size 8
// CHECK: #0 -[MyClass method:] // CHECK: #0 -[MyClass method:]
// CHECK: Write of size 8 // CHECK: Previous write of size 8
// CHECK: #0 -[MyClass method:] // CHECK: #0 -[MyClass method:]
// CHECK: Location is heap block // CHECK: Location is heap block
// CHECK: Done. // CHECK: Done.

test/tsan/Darwin/objc-simple.mm

// Test that a simple Obj-C program runs and exits without any warnings. // Test that a simple Obj-C program runs and exits without any warnings.
// RUN: %clang_tsan %s -o %t -framework Foundation // RUN: %clang_tsan %s -o %t -framework Foundation
// RUN: %run %t 2>&1 // RUN: %run %t 2>&1 | FileCheck %s
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
int main() { int main() {
NSLog(@"Hello world"); NSLog(@"Hello world");
} }
// CHECK: Hello world // CHECK: Hello world
// CHECK-NOT: WARNING: ThreadSanitizer // CHECK-NOT: WARNING: ThreadSanitizer