Bug 512571 - regtest problems with darwin dsymuti

There was alrwady a stderr filter for dsymutil, but only for DRD.
So I moved that to tests/filter_stderr_basic.in

I added single quotes around $dir in tests/vg_regtest.in for
arch_test and os_test. That now prevents directory names containing
spaces from being seen as more than one argument.

diff --git a/NEWS b/NEWS
index 84673b407728d444ca801e2031d5434ce9dc9541..89493bbf6a408a9eeeb48300afecf7527844058f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -35,6 +35,7 @@ are not entered into bugzilla tend to get forgotten about or ignored.
         '-Wno-alloc-size-larger-than=18446744073709551615'
 512030  s390x: bfp-convert testcase fails
 512037  malloc trace does not print free size or alignment
+512571  regtest problems with darwin dsymuti
 
 To see details of a given bug, visit
   https://bugs.kde.org/show_bug.cgi?id=XXXXXX

diff --git a/drd/tests/filter_stderr.in b/drd/tests/filter_stderr.in
index 485a588b898bda647d3235037925bb4d76d95fa5..fea9bcff9dccd73a1a0273d02d7c87614e4c3471 100644 (file)
--- a/drd/tests/filter_stderr.in
+++ b/drd/tests/filter_stderr.in
@@ -27,7 +27,6 @@ $SED \
 -e "/^warning: evaluate_Dwarf3_Expr: unhandled DW_OP_.*/d" \
 -e '/^warning: addVar:.*/d' \
 -e 's/^Allocation context: Data section of .\//Allocation context: BSS section of /' \
--e '/^run: \/usr\/bin\/dsymutil.*/d' \
 -e "s/, in frame #[0-9]* of thread /, in frame #? of thread /" \
 -e "s/(\(functional\|thread\):[0-9]*)/(\1:...)/" \
 -e "s/(tc20_verifywrap.c:261)/(tc20_verifywrap.c:262)/" \

diff --git a/tests/filter_stderr_basic.in b/tests/filter_stderr_basic.in
index d14ca727dfb19a877a6658ab02ba88aff857aa0e..90d8993195addb8839da5544d482b0c9ff2af413 100644 (file)
--- a/tests/filter_stderr_basic.in
+++ b/tests/filter_stderr_basic.in
@@ -77,7 +77,9 @@ $SED "s/[0-9][0-9]* bytes below stack pointer/.... bytes below stack pointer/" |
 $SED '/warning: the debug information found in "[^"]*" does not match/d' |
 
 # Suppress warnings from Dwarf reader
-$SED '/warning: evaluate_Dwarf3_Expr: unhandled DW_OP_/d'
+$SED '/warning: evaluate_Dwarf3_Expr: unhandled DW_OP_/d' |
 
 # Suppress Darwin dyld errors
-$SED '/^used_suppression:.*OSX.*dyld.*default.supp:*/d'
+$SED '/^used_suppression:.*OSX.*dyld.*default.supp:*/d' |
+# Suppress Darwin running dsymutil
+$SED -e '/^run: \/usr\/bin\/dsymutil.*/d' \

diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in
index 0d7ec71a66c25649d4c3142969213e2dbf9683fc..9bc95fcbbf78ad9794f73800675fb5a83b308b53 100644 (file)
--- a/tests/vg_regtest.in
+++ b/tests/vg_regtest.in
@@ -689,8 +689,8 @@ sub test_one_dir($$)
     # ppc/ directories ('arch_test' returns 1 for this case).  Likewise for
     # the OS and platform.
     # Nb: weird Perl-ism -- exit code of '1' is seen by Perl as 256...
-    if (256 == system("$tests_dir/tests/arch_test $dir"))  { return; }
-    if (256 == system("$tests_dir/tests/os_test   $dir"))  { return; }
+    if (256 == system("$tests_dir/tests/arch_test '$dir'"))  { return; }
+    if (256 == system("$tests_dir/tests/os_test   '$dir'"))  { return; }
     if ($dir =~ /(\w+)-(\w+)/ &&
         256 == system("$tests_dir/tests/platform_test $1 $2")) { return; }
     if ($dir =~ "dSYM") { return; }