diff options
| -rw-r--r-- | drd/tests/Makefile.am | 3 | ||||
| -rw-r--r-- | drd/tests/atomic_var.stderr.exp-with-atomic-builtins (renamed from drd/tests/atomic_var.stderr.exp-with-atomic-builtins-1) | 5 | ||||
| -rw-r--r-- | drd/tests/atomic_var.stderr.exp-with-atomic-builtins-2 | 14 | ||||
| -rw-r--r-- | drd/tests/atomic_var.vgtest | 1 | ||||
| -rwxr-xr-x | drd/tests/filter_stderr_and_thread_no | 3 |
5 files changed, 6 insertions, 20 deletions
diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am index 5ba66ec30..ca61cdecd 100644 --- a/drd/tests/Makefile.am +++ b/drd/tests/Makefile.am @@ -14,8 +14,7 @@ noinst_SCRIPTS = \ EXTRA_DIST = \ $(noinst_SCRIPTS) \ - atomic_var.stderr.exp-with-atomic-builtins-1 \ - atomic_var.stderr.exp-with-atomic-builtins-2 \ + atomic_var.stderr.exp-with-atomic-builtins \ atomic_var.stderr.exp-without-atomic-builtins \ atomic_var.vgtest \ bar_bad.stderr.exp \ diff --git a/drd/tests/atomic_var.stderr.exp-with-atomic-builtins-1 b/drd/tests/atomic_var.stderr.exp-with-atomic-builtins index 859f3649c..0c79ab9c2 100644 --- a/drd/tests/atomic_var.stderr.exp-with-atomic-builtins-1 +++ b/drd/tests/atomic_var.stderr.exp-with-atomic-builtins @@ -1,13 +1,12 @@ Start of test. -Thread 2: -Conflicting load by thread 2/3 at 0x........ size 4 +Conflicting load by thread x/x at 0x........ size 4 at 0x........: thread_func_2 (atomic_var.c:?) by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?) by 0x........: (within libpthread-?.?.so) by 0x........: clone (in /...libc...) Location 0x........ is 0 bytes inside local var "s_y" -declared at atomic_var.c:35, in frame #? of thread 2 +declared at atomic_var.c:35, in frame #? of thread x y = 1 Test finished. diff --git a/drd/tests/atomic_var.stderr.exp-with-atomic-builtins-2 b/drd/tests/atomic_var.stderr.exp-with-atomic-builtins-2 deleted file mode 100644 index 45bf43816..000000000 --- a/drd/tests/atomic_var.stderr.exp-with-atomic-builtins-2 +++ /dev/null @@ -1,14 +0,0 @@ - -Start of test. -Thread 3: -Conflicting load by thread 3/3 at 0x........ size 4 - at 0x........: thread_func_2 (atomic_var.c:?) - by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?) - by 0x........: (within libpthread-?.?.so) - by 0x........: clone (in /...libc...) -Location 0x........ is 0 bytes inside local var "s_y" -declared at atomic_var.c:35, in frame #? of thread 3 -y = 1 -Test finished. - -ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0) diff --git a/drd/tests/atomic_var.vgtest b/drd/tests/atomic_var.vgtest index 054312076..f371eca4f 100644 --- a/drd/tests/atomic_var.vgtest +++ b/drd/tests/atomic_var.vgtest @@ -1,3 +1,4 @@ prereq: ./supported_libpthread vgopts: --var-info=yes --check-stack-var=yes --show-confl-seg=no prog: atomic_var +stderr_filter: filter_stderr_and_thread_no diff --git a/drd/tests/filter_stderr_and_thread_no b/drd/tests/filter_stderr_and_thread_no index 6d1997cfe..c080b804d 100755 --- a/drd/tests/filter_stderr_and_thread_no +++ b/drd/tests/filter_stderr_and_thread_no @@ -5,4 +5,5 @@ # Get rid of the numbers as these make some tests more scheduling sensitive # -- those where there are multiple threads which play interchangeable roles. grep -v "^Thread [0-9][0-9]*:$" | -sed -e "s:hread [0-9][0-9]*/[0-9][0-9]*:hread x/x:g" +sed -e "s:hread [0-9][0-9]*/[0-9][0-9]*:hread x/x:g" \ + -e "s:of thread [0-9][0-9]*$:of thread x:g" |