Mailing List Archive

commit 7bc5cf683c54bb3457c927e0b8cb3695a0946aa6
Author: Nils Goroll <nils.goroll@uplex.de>
Date: Tue Dec 5 08:10:14 2023 +0100

Fix vtest reporting when build dir is just _build/, not _build/sub/

See "cope with older automake" a couple of lines up

Should fix the issue seen with Solaris vtesters. bash -x output:

+ vtc=./varnish-trunk/_build/bin/varnishtest/tests/r02686.vtc
++ echo ./varnish-trunk/_build/bin/varnishtest/tests/r02686.trs
++ sed -e 's/trs$/log/'
+ logfile=./varnish-trunk/_build/bin/varnishtest/tests/r02686.log
+ log=r02686.log
++ git log -n 1 --pretty=format:%H ./varnish-trunk/_build/bin/varnishtest/tests/r02686.vtc
fatal: ambiguous argument './varnish-trunk/_build/bin/varnishtest/tests/r02686.vtc': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
+ rev=

diff --git a/tools/vtest.sh b/tools/vtest.sh
index 00620502f..bf6c37a8a 100755
--- a/tools/vtest.sh
+++ b/tools/vtest.sh
@@ -194,7 +194,7 @@ failedtests () (
while read trs
do
name=`basename "${trs}" .trs`
- vtc=`echo $trs | sed -e 's/trs$/vtc/' -e 's/.*sub\///' `
+ vtc=`echo $trs | sed -e 's/trs$/vtc/' -e 's/.*_build\/\(sub\/\)\?//'`
logfile=`echo $trs | sed -e 's/trs$/log/'`
log="${name}.log"
rev=`git log -n 1 --pretty=format:%H "${vtc}"`
_______________________________________________
varnish-commit mailing list
varnish-commit@varnish-cache.org
https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit