|
From: <sv...@va...> - 2007-11-01 17:15:34
|
Author: sewardj Date: 2007-11-01 17:15:35 +0000 (Thu, 01 Nov 2007) New Revision: 7076 Log: Filter even more stuff out of stderr so that regtests still work even in the unlikely event that glibc/libpthread/libdl/ld.so are built with debugging information. Modified: branches/THRCHECK/thrcheck/tests/filter_stderr Modified: branches/THRCHECK/thrcheck/tests/filter_stderr =================================================================== --- branches/THRCHECK/thrcheck/tests/filter_stderr 2007-11-01 17:13:52 UTC (rev 7075) +++ branches/THRCHECK/thrcheck/tests/filter_stderr 2007-11-01 17:15:35 UTC (rev 7076) @@ -11,7 +11,7 @@ sed "/^Thrcheck, a thread error detector/ , /./ d" | # Anonymise line numbers in tc_intercepts.c -sed "s/tc_intercepts.c:[0-9]*/tc_intercepts.c:.../" | +sed "s/tc_intercepts.c:[0-9]*/tc_intercepts.c:.../g" | # Change (eg) "/lib64/libpthread-2.5.so" into "/lib/libpthread..." sed "s/lib64/lib/g" | @@ -21,4 +21,10 @@ # and (eg) "pthread_create@GLIBC_2.1" into "pthread_create@GLIBC" sed "s/@@*GLIBC_2[0123456789\.]*/@GLIBC_/g" | +# 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]*)$/.../g" | + $dir/../../tests/filter_test_paths |