[master] 8bcbc8655 Update vtest.sh to correctly report vmod tests

Poul-Henning Kamp phk at FreeBSD.org
Mon May 1 19:16:11 UTC 2023


commit 8bcbc8655801d0bfc8b49718a8d997a7bfd562f2
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon May 1 19:15:12 2023 +0000

    Update vtest.sh to correctly report vmod tests

diff --git a/tools/vtest.sh b/tools/vtest.sh
index f695f1f56..00620502f 100755
--- a/tools/vtest.sh
+++ b/tools/vtest.sh
@@ -190,14 +190,15 @@ failedtests () (
 	test ! -d $LOGDIR &&
 	LOGDIR="bin/varnishtest/tests"
 
-	grep -l ':test-result: FAIL' "$LOGDIR"/*.trs |
+	find . -name '*.trs' -print | xargs grep -l ':test-result: FAIL' |
 	while read trs
 	do
 		name=`basename "${trs}" .trs`
-		vtc="${name}.vtc"
+		vtc=`echo $trs | sed -e 's/trs$/vtc/' -e 's/.*sub\///' `
+		logfile=`echo $trs | sed -e 's/trs$/log/'`
 		log="${name}.log"
-		rev=`git log -n 1 --pretty=format:%H "${VTCDIR}/${vtc}"`
-		cp "${LOGDIR}/${log}" "${REPORTDIR}/_${log}"
+		rev=`git log -n 1 --pretty=format:%H "${vtc}"`
+		cp "${logfile}" "${REPORTDIR}/_${log}"
 		echo "VTCGITREV ${name} ${rev}"
 		echo "MANIFEST _${log}"
 	done


More information about the varnish-commit mailing list