[master] 9d6e0b759 Workaround failure under macos

Federico G. Schwindt fgsch at lodoss.net
Wed Dec 30 00:23:09 UTC 2020


commit 9d6e0b7597d8a3787eacb442f6bca979bd782e0d
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Wed Dec 30 00:17:09 2020 +0000

    Workaround failure under macos
    
    Apple's clang calls dsymutil(1) when -g is used, creating a
    <binary>.dSYM directory which breaks this test. As I haven't found
    a way to disable it just ignore this check if the directory is
    present.

diff --git a/bin/varnishtest/tests/u00000.vtc b/bin/varnishtest/tests/u00000.vtc
index 570c778d3..29e602253 100644
--- a/bin/varnishtest/tests/u00000.vtc
+++ b/bin/varnishtest/tests/u00000.vtc
@@ -4,7 +4,8 @@ shell "varnishd -b 127.0.0.1:80 -C 2> ${tmpdir}/_.c"
 
 shell {
 	varnishd -n ${tmpdir}/no_keep -C -b 127.0.0.1:80 2> no_keep.c
-	test -s no_keep.c && ! test -d no_keep || test -f no_keep/*/vgc.gcda
+	test -s no_keep.c && ! test -d no_keep || \
+	    (test -f no_keep/*/vgc.gcda || test -d no_keep/*/vgc.so.dSYM)
 }
 
 shell {


More information about the varnish-commit mailing list