From 1fdaad147b2f3ca82d2474a95b3dd2d2482fa906 Mon Sep 17 00:00:00 2001 From: Diego Novillo Date: Thu, 10 Jul 2014 23:29:10 +0000 Subject: Fix expected column numbers in two tests. This is a minor fix to two tsan tests that were expecting the wrong column information. Now that clang emits column information by default in its debugging output, the tests had started failing. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@212779 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/tsan/simple_stack.c | 2 +- test/tsan/simple_stack2.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/tsan/simple_stack.c b/test/tsan/simple_stack.c index 899277f4e..87367033b 100644 --- a/test/tsan/simple_stack.c +++ b/test/tsan/simple_stack.c @@ -53,7 +53,7 @@ int main() { // CHECK-NEXT: #1 bar1{{.*}} {{.*}}simple_stack.c:14{{(:3)?}} ({{.*}}) // CHECK-NEXT: #2 Thread1{{.*}} {{.*}}simple_stack.c:28{{(:3)?}} ({{.*}}) // CHECK: Previous read of size 4 at {{.*}} by thread T2: -// CHECK-NEXT: #0 foo2{{.*}} {{.*}}simple_stack.c:18{{(:26)?}} ({{.*}}) +// CHECK-NEXT: #0 foo2{{.*}} {{.*}}simple_stack.c:18{{(:3)?}} ({{.*}}) // CHECK-NEXT: #1 bar2{{.*}} {{.*}}simple_stack.c:23{{(:3)?}} ({{.*}}) // CHECK-NEXT: #2 Thread2{{.*}} {{.*}}simple_stack.c:33{{(:3)?}} ({{.*}}) // CHECK: Thread T1 (tid={{.*}}, running) created by main thread at: diff --git a/test/tsan/simple_stack2.cc b/test/tsan/simple_stack2.cc index ba0303c1e..ae1c27b4d 100644 --- a/test/tsan/simple_stack2.cc +++ b/test/tsan/simple_stack2.cc @@ -48,6 +48,6 @@ int main() { // CHECK-NEXT: #1 bar1{{.*}} {{.*}}simple_stack2.cc:16{{(:3)?}} ({{.*}}) // CHECK-NEXT: #2 Thread1{{.*}} {{.*}}simple_stack2.cc:34{{(:3)?}} ({{.*}}) // CHECK: Previous read of size 4 at {{.*}} by main thread: -// CHECK-NEXT: #0 foo2{{.*}} {{.*}}simple_stack2.cc:20{{(:28)?}} ({{.*}}) +// CHECK-NEXT: #0 foo2{{.*}} {{.*}}simple_stack2.cc:20{{(:3)?}} ({{.*}}) // CHECK-NEXT: #1 bar2{{.*}} {{.*}}simple_stack2.cc:29{{(:3)?}} ({{.*}}) // CHECK-NEXT: #2 main{{.*}} {{.*}}simple_stack2.cc:41{{(:3)?}} ({{.*}}) -- cgit v1.2.1