[TSan][libdispatch] Move libdispatch tests out of Darwin folder

The libdispatch tests are now not tied to Darwin anymore. Move them to
their own platform-independent folder.

llvm-svn: 358316

23 files changed, 8 insertions, 6 deletions

diff --git a/compiler-rt/test/tsan/Darwin/gcd-after.mm b/compiler-rt/test/tsan/libdispatch/after.c
index 59281e76d6d..59281e76d6d 100644
--- a/compiler-rt/test/tsan/Darwin/gcd-after.mm
+++ b/compiler-rt/test/tsan/libdispatch/after.c
diff --git a/compiler-rt/test/tsan/Darwin/gcd-async-norace.mm b/compiler-rt/test/tsan/libdispatch/async-norace.c
index c3b60357935..c3b60357935 100644
--- a/compiler-rt/test/tsan/Darwin/gcd-async-norace.mm
+++ b/compiler-rt/test/tsan/libdispatch/async-norace.c
diff --git a/compiler-rt/test/tsan/Darwin/gcd-async-race.mm b/compiler-rt/test/tsan/libdispatch/async-race.c
index ecb2a8007bf..6701f101c70 100644
--- a/compiler-rt/test/tsan/Darwin/gcd-async-race.mm
+++ b/compiler-rt/test/tsan/libdispatch/async-race.c
@@ -33,5 +33,5 @@ int main() {
 // CHECK: Hello world.
 // CHECK: addr=[[ADDR:0x[0-9,a-f]+]]
 // CHECK: WARNING: ThreadSanitizer: data race
-// CHECK: Location is global 'global' {{(of size 8 )?}}at [[ADDR]] (gcd-async-race.mm.tmp+0x{{[0-9,a-f]+}})
+// CHECK: Location is global 'global' {{(of size 8 )?}}at [[ADDR]] (async-race.c.tmp+0x{{[0-9,a-f]+}})
 // CHECK: Done.
diff --git a/compiler-rt/test/tsan/Darwin/gcd-barrier-race.mm b/compiler-rt/test/tsan/libdispatch/barrier-race.c
index 417898a7779..278824424d0 100644
--- a/compiler-rt/test/tsan/Darwin/gcd-barrier-race.mm
+++ b/compiler-rt/test/tsan/libdispatch/barrier-race.c
@@ -43,5 +43,5 @@ int main() {
 // CHECK: Hello world.
 // CHECK: addr=[[ADDR:0x[0-9,a-f]+]]
 // CHECK: WARNING: ThreadSanitizer: data race
-// CHECK: Location is global 'global' {{(of size 8 )?}}at [[ADDR]] (gcd-barrier-race.mm.tmp+0x{{[0-9,a-f]+}})
+// CHECK: Location is global 'global' {{(of size 8 )?}}at [[ADDR]] (barrier-race.c.tmp+0x{{[0-9,a-f]+}})
 // CHECK: Done.
diff --git a/compiler-rt/test/tsan/Darwin/gcd-barrier.mm b/compiler-rt/test/tsan/libdispatch/barrier.c
index 52b115ed34d..52b115ed34d 100644
--- a/compiler-rt/test/tsan/Darwin/gcd-barrier.mm
+++ b/compiler-rt/test/tsan/libdispatch/barrier.c
diff --git a/compiler-rt/test/tsan/Darwin/gcd-blocks.mm b/compiler-rt/test/tsan/libdispatch/blocks.c
index 413b2208576..413b2208576 100644
--- a/compiler-rt/test/tsan/Darwin/gcd-blocks.mm
+++ b/compiler-rt/test/tsan/libdispatch/blocks.c
diff --git a/compiler-rt/test/tsan/Darwin/gcd-fd.mm b/compiler-rt/test/tsan/libdispatch/fd.c
index 9a77a3f3c82..9a77a3f3c82 100644
--- a/compiler-rt/test/tsan/Darwin/gcd-fd.mm
+++ b/compiler-rt/test/tsan/libdispatch/fd.c
diff --git a/compiler-rt/test/tsan/Darwin/gcd-groups-norace.mm b/compiler-rt/test/tsan/libdispatch/groups-norace.c
index 0a8447e3aaa..0a8447e3aaa 100644
--- a/compiler-rt/test/tsan/Darwin/gcd-groups-norace.mm
+++ b/compiler-rt/test/tsan/libdispatch/groups-norace.c
diff --git a/compiler-rt/test/tsan/Darwin/gcd-io-barrier-race.mm b/compiler-rt/test/tsan/libdispatch/io-barrier-race.c
index 150f4037fe6..5e7fe80f073 100644
--- a/compiler-rt/test/tsan/Darwin/gcd-io-barrier-race.mm
+++ b/compiler-rt/test/tsan/libdispatch/io-barrier-race.c
@@ -50,5 +50,5 @@ int main(int argc, const char *argv[]) {
 // CHECK: Hello world.
 // CHECK: addr=[[ADDR:0x[0-9,a-f]+]]
 // CHECK: WARNING: ThreadSanitizer: data race
-// CHECK: Location is global 'my_global' {{(of size 8 )?}}at [[ADDR]] (gcd-io-barrier-race.mm.tmp+0x{{[0-9,a-f]+}})
+// CHECK: Location is global 'my_global' {{(of size 8 )?}}at [[ADDR]] (io-barrier-race.c.tmp+0x{{[0-9,a-f]+}})
 // CHECK: Done.
diff --git a/compiler-rt/test/tsan/Darwin/gcd-io-barrier.mm b/compiler-rt/test/tsan/libdispatch/io-barrier.c
index 849644e44ef..849644e44ef 100644
--- a/compiler-rt/test/tsan/Darwin/gcd-io-barrier.mm
+++ b/compiler-rt/test/tsan/libdispatch/io-barrier.c
diff --git a/compiler-rt/test/tsan/Darwin/gcd-io-cleanup.mm b/compiler-rt/test/tsan/libdispatch/io-cleanup.c
index 3e1c9d78e9c..3e1c9d78e9c 100644
--- a/compiler-rt/test/tsan/Darwin/gcd-io-cleanup.mm
+++ b/compiler-rt/test/tsan/libdispatch/io-cleanup.c
diff --git a/compiler-rt/test/tsan/Darwin/gcd-io-race.mm b/compiler-rt/test/tsan/libdispatch/io-race.c
index 7d7f603856d..27d315c4b27 100644
--- a/compiler-rt/test/tsan/Darwin/gcd-io-race.mm
+++ b/compiler-rt/test/tsan/libdispatch/io-race.c
@@ -3,7 +3,9 @@
 
 // REQUIRES: disabled
 
-#import "../test.h"
+#include <dispatch/dispatch.h>
+
+#include "../test.h"
 
 dispatch_queue_t queue;
 dispatch_data_t data;
@@ -49,5 +51,5 @@ int main(int argc, const char *argv[]) {
 // CHECK: Hello world.
 // CHECK: addr=[[ADDR:0x[0-9,a-f]+]]
 // CHECK: WARNING: ThreadSanitizer: data race
-// CHECK: Location is global 'my_global' {{(of size 8 )?}}at [[ADDR]] (gcd-io-race.mm.tmp+0x{{[0-9,a-f]+}})
+// CHECK: Location is global 'my_global' {{(of size 8 )?}}at [[ADDR]] (io-race.c.tmp+0x{{[0-9,a-f]+}})
 // CHECK: Done.
diff --git a/compiler-rt/test/tsan/Darwin/gcd-io.mm b/compiler-rt/test/tsan/libdispatch/io.c
index 6302e743d88..6302e743d88 100644
--- a/compiler-rt/test/tsan/Darwin/gcd-io.mm
+++ b/compiler-rt/test/tsan/libdispatch/io.c
diff --git a/compiler-rt/test/tsan/Darwin/gcd-serial-queue-norace.mm b/compiler-rt/test/tsan/libdispatch/serial-queue-norace.c
index 17fb5f1c73b..17fb5f1c73b 100644
--- a/compiler-rt/test/tsan/Darwin/gcd-serial-queue-norace.mm
+++ b/compiler-rt/test/tsan/libdispatch/serial-queue-norace.c
diff --git a/compiler-rt/test/tsan/Darwin/gcd-source-cancel.mm b/compiler-rt/test/tsan/libdispatch/source-cancel.c
index bc7282d319a..bc7282d319a 100644
--- a/compiler-rt/test/tsan/Darwin/gcd-source-cancel.mm
+++ b/compiler-rt/test/tsan/libdispatch/source-cancel.c
diff --git a/compiler-rt/test/tsan/Darwin/gcd-source-cancel2.mm b/compiler-rt/test/tsan/libdispatch/source-cancel2.c
index 8ec2732dc60..8ec2732dc60 100644
--- a/compiler-rt/test/tsan/Darwin/gcd-source-cancel2.mm
+++ b/compiler-rt/test/tsan/libdispatch/source-cancel2.c
diff --git a/compiler-rt/test/tsan/Darwin/gcd-source-event.mm b/compiler-rt/test/tsan/libdispatch/source-event.c
index f07dd1ea7b9..f07dd1ea7b9 100644
--- a/compiler-rt/test/tsan/Darwin/gcd-source-event.mm
+++ b/compiler-rt/test/tsan/libdispatch/source-event.c
diff --git a/compiler-rt/test/tsan/Darwin/gcd-source-event2.mm b/compiler-rt/test/tsan/libdispatch/source-event2.c
index 5c2b6b72cdc..5c2b6b72cdc 100644
--- a/compiler-rt/test/tsan/Darwin/gcd-source-event2.mm
+++ b/compiler-rt/test/tsan/libdispatch/source-event2.c
diff --git a/compiler-rt/test/tsan/Darwin/gcd-source-registration.mm b/compiler-rt/test/tsan/libdispatch/source-registration.c
index 296c0055b15..296c0055b15 100644
--- a/compiler-rt/test/tsan/Darwin/gcd-source-registration.mm
+++ b/compiler-rt/test/tsan/libdispatch/source-registration.c
diff --git a/compiler-rt/test/tsan/Darwin/gcd-source-registration2.mm b/compiler-rt/test/tsan/libdispatch/source-registration2.c
index 1e51f6f36b8..1e51f6f36b8 100644
--- a/compiler-rt/test/tsan/Darwin/gcd-source-registration2.mm
+++ b/compiler-rt/test/tsan/libdispatch/source-registration2.c
diff --git a/compiler-rt/test/tsan/Darwin/gcd-sync-norace.mm b/compiler-rt/test/tsan/libdispatch/sync-norace.c
index 38d9be384c3..38d9be384c3 100644
--- a/compiler-rt/test/tsan/Darwin/gcd-sync-norace.mm
+++ b/compiler-rt/test/tsan/libdispatch/sync-norace.c
diff --git a/compiler-rt/test/tsan/Darwin/gcd-sync-race.mm b/compiler-rt/test/tsan/libdispatch/sync-race.c
index 5ee7761d076..ec0d43c0b80 100644
--- a/compiler-rt/test/tsan/Darwin/gcd-sync-race.mm
+++ b/compiler-rt/test/tsan/libdispatch/sync-race.c
@@ -38,5 +38,5 @@ int main() {
 // CHECK: Hello world.
 // CHECK: addr=[[ADDR:0x[0-9,a-f]+]]
 // CHECK: WARNING: ThreadSanitizer: data race
-// CHECK: Location is global 'global' {{(of size 8 )?}}at [[ADDR]] (gcd-sync-race.mm.tmp+0x{{[0-9,a-f]+}})
+// CHECK: Location is global 'global' {{(of size 8 )?}}at [[ADDR]] (sync-race.c.tmp+0x{{[0-9,a-f]+}})
 // CHECK: Done.
diff --git a/compiler-rt/test/tsan/Darwin/gcd-target-queue-norace.mm b/compiler-rt/test/tsan/libdispatch/target-queue-norace.c
index b5361c81f60..b5361c81f60 100644
--- a/compiler-rt/test/tsan/Darwin/gcd-target-queue-norace.mm
+++ b/compiler-rt/test/tsan/libdispatch/target-queue-norace.c