From 68c2c514f8f204401ea2bd2f6cf848022eed6802 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Wed, 16 Oct 2013 15:57:23 +0000 Subject: tsan: revert variable name change in test It works as is with new llvm-symbolizer. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@192798 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/tsan/lit_tests/global_race.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/tsan/lit_tests/global_race.cc b/lib/tsan/lit_tests/global_race.cc index cbe9f147..ac201615 100644 --- a/lib/tsan/lit_tests/global_race.cc +++ b/lib/tsan/lit_tests/global_race.cc @@ -4,7 +4,7 @@ #include int GlobalData[10]; -int qwerty; +int x; namespace XXX { struct YYY { static int ZZZ[10]; @@ -14,19 +14,19 @@ namespace XXX { void *Thread(void *a) { GlobalData[2] = 42; - qwerty = 1; + x = 1; XXX::YYY::ZZZ[0] = 1; return 0; } int main() { fprintf(stderr, "addr=%p\n", GlobalData); - fprintf(stderr, "addr2=%p\n", &qwerty); + fprintf(stderr, "addr2=%p\n", &x); fprintf(stderr, "addr3=%p\n", XXX::YYY::ZZZ); pthread_t t; pthread_create(&t, 0, Thread, 0); GlobalData[2] = 43; - qwerty = 0; + x = 0; XXX::YYY::ZZZ[0] = 0; pthread_join(t, 0); } @@ -37,6 +37,6 @@ int main() { // CHECK: WARNING: ThreadSanitizer: data race // CHECK: Location is global 'GlobalData' of size 40 at [[ADDR]] ({{.*}}+0x{{[0-9,a-f]+}}) // CHECK: WARNING: ThreadSanitizer: data race -// CHECK: Location is global 'qwerty' of size 4 at [[ADDR2]] ({{.*}}+0x{{[0-9,a-f]+}}) +// CHECK: Location is global 'x' of size 4 at [[ADDR2]] ({{.*}}+0x{{[0-9,a-f]+}}) // CHECK: WARNING: ThreadSanitizer: data race // CHECK: Location is global 'XXX::YYY::ZZZ' of size 40 at [[ADDR3]] ({{.*}}+0x{{[0-9,a-f]+}}) -- cgit v1.2.3