From: Paul Floyd Date: Tue, 25 Nov 2025 07:20:06 +0000 (+0100) Subject: Bug 512571 - regtest problems with darwin dsymuti X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=097cd6ccfc225c79b33d67b0f022f7179128b7cf;p=thirdparty%2Fvalgrind.git 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 84673b407..89493bbf6 100644 --- 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 485a588b8..fea9bcff9 100644 --- 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 d14ca727d..90d899319 100644 --- 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 0d7ec71a6..9bc95fcbb 100644 --- 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; }