|
From: <sv...@va...> - 2008-12-18 08:27:38
|
Author: sewardj Date: 2008-12-18 08:27:32 +0000 (Thu, 18 Dec 2008) New Revision: 8839 Log: Move the functionality from filter_threadnums into filter_stderr, so that it applies to all tests. Then remove all references to filter_threadnums. Also: * match and transform not only "Thread #n" and "thread #n" but also "Thread n" and "thread n", where n is [0-9][0-9]*. * use -e ... for the sed commands where possible, to reduce the number of processes that have to be started Removed: trunk/helgrind/tests/filter_threadnums Modified: trunk/helgrind/tests/Makefile.am trunk/helgrind/tests/filter_stderr trunk/helgrind/tests/pth_barrier1.vgtest trunk/helgrind/tests/pth_barrier2.vgtest trunk/helgrind/tests/pth_barrier3.vgtest trunk/helgrind/tests/tc21_pthonce.vgtest Modified: trunk/helgrind/tests/Makefile.am =================================================================== --- trunk/helgrind/tests/Makefile.am 2008-12-18 01:20:11 UTC (rev 8838) +++ trunk/helgrind/tests/Makefile.am 2008-12-18 08:27:32 UTC (rev 8839) @@ -2,7 +2,7 @@ # For AM_FLAG_M3264_PRI include $(top_srcdir)/Makefile.flags.am -noinst_SCRIPTS = filter_stderr filter_threadnums +noinst_SCRIPTS = filter_stderr EXTRA_DIST = $(noinst_SCRIPTS) \ bar_bad.vgtest bar_bad.stdout.exp \ Modified: trunk/helgrind/tests/filter_stderr =================================================================== --- trunk/helgrind/tests/filter_stderr 2008-12-18 01:20:11 UTC (rev 8838) +++ trunk/helgrind/tests/filter_stderr 2008-12-18 08:27:32 UTC (rev 8839) @@ -14,8 +14,9 @@ sed "s/hg_intercepts.c:[0-9]*/hg_intercepts.c:.../g" | # Change (eg) "/lib64/libpthread-2.5.so" into "/lib/libpthread..." -sed "s/lib64/lib/g" | -sed "s/libpthread.*so/libpthread\.\.\./g" | +sed \ + -e "s/lib64/lib/g" \ + -e "s/libpthread.*so/libpthread\.\.\./g" | # Change (eg) "pthread_create@@GLIBC_2.2.5" into "pthread_create@GLIBC" # and (eg) "pthread_create@GLIBC_2.1" into "pthread_create@GLIBC" @@ -23,8 +24,17 @@ # Tidy up in cases where glibc (+ libdl + libpthread + ld) have # been built with debugging information, hence source locs are present -sed "s/(createthread.c:[0-9]*)/(in \/lib\/libpthread...)/g" | -sed "s/(clone.S:[0-9]*)/(in \/...libc...)/g" | -sed "s/start_thread (pthread_create.c:[0-9]*)$/start_thread (in \/lib\/libpthread...)/g" | +sed \ + -e "s/(createthread.c:[0-9]*)/(in \/lib\/libpthread...)/g" \ + -e "s/(clone.S:[0-9]*)/(in \/...libc...)/g" \ + -e "s/start_thread (pthread_create.c:[0-9]*)$/start_thread (in \/lib\/libpthread...)/g" | +# get rid of the numbers in bits of text "Thread #n", "thread #n", +# "Thread n" and "thread n", +# as these make some tests more scheduling sensitive -- those where +# there are multiple threads which play interchangeable roles. +sed \ + -e "s/hread #[0-9][0-9]*/hread #x/g" \ + -e "s/hread [0-9][0-9]*/hread x/g" + $dir/../../tests/filter_test_paths Deleted: trunk/helgrind/tests/filter_threadnums =================================================================== --- trunk/helgrind/tests/filter_threadnums 2008-12-18 01:20:11 UTC (rev 8838) +++ trunk/helgrind/tests/filter_threadnums 2008-12-18 08:27:32 UTC (rev 8839) @@ -1,9 +0,0 @@ -#! /bin/sh - -./filter_stderr | - -# get rid of the numbers in bits of text "Thread #n" and "thread #n" -# as these make some tests more scheduling sensitive -- those where -# there are multiple threads which play interchangeable roles. - -sed "s/hread #[0-9]*/hread #x/" Modified: trunk/helgrind/tests/pth_barrier1.vgtest =================================================================== --- trunk/helgrind/tests/pth_barrier1.vgtest 2008-12-18 01:20:11 UTC (rev 8838) +++ trunk/helgrind/tests/pth_barrier1.vgtest 2008-12-18 08:27:32 UTC (rev 8839) @@ -1,4 +1,3 @@ prog: pth_barrier args: 2 1 1 vgopts: -q -stderr_filter: ./filter_threadnums Modified: trunk/helgrind/tests/pth_barrier2.vgtest =================================================================== --- trunk/helgrind/tests/pth_barrier2.vgtest 2008-12-18 01:20:11 UTC (rev 8838) +++ trunk/helgrind/tests/pth_barrier2.vgtest 2008-12-18 08:27:32 UTC (rev 8839) @@ -1,4 +1,3 @@ prog: pth_barrier args: 2 32 1 vgopts: -q --cmp-race-err-addrs=yes -stderr_filter: ./filter_threadnums Modified: trunk/helgrind/tests/pth_barrier3.vgtest =================================================================== --- trunk/helgrind/tests/pth_barrier3.vgtest 2008-12-18 01:20:11 UTC (rev 8838) +++ trunk/helgrind/tests/pth_barrier3.vgtest 2008-12-18 08:27:32 UTC (rev 8839) @@ -1,4 +1,3 @@ prog: pth_barrier args: 32 1 1 vgopts: -q -stderr_filter: ./filter_threadnums Modified: trunk/helgrind/tests/tc21_pthonce.vgtest =================================================================== --- trunk/helgrind/tests/tc21_pthonce.vgtest 2008-12-18 01:20:11 UTC (rev 8838) +++ trunk/helgrind/tests/tc21_pthonce.vgtest 2008-12-18 08:27:32 UTC (rev 8839) @@ -1,2 +1 @@ prog: tc21_pthonce -stderr_filter: ./filter_threadnums |