[master] 48a93f6 Fix vtest on SmartOS

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Mon Jan 16 18:51:05 CET 2017


commit 48a93f69e7387a7fa0b85e0d736c179843864722
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Mon Jan 16 18:48:19 2017 +0100

    Fix vtest on SmartOS
    
    It looks like it was simply a difference between automake versions,
    let's see if it pans out.
    
    Refs #2139

diff --git a/tools/vtest.sh b/tools/vtest.sh
index 33d94f1..4bb8ffe 100755
--- a/tools/vtest.sh
+++ b/tools/vtest.sh
@@ -183,6 +183,10 @@ failedtests () (
 	LOGDIR="varnish-$VERSION/_build/sub/bin/varnishtest/tests"
 	VTCDIR=bin/varnishtest/tests
 
+	# cope with older automake, remove the sub directory
+	test ! -d $LOGDIR &&
+	LOGDIR="varnish-$VERSION/_build/bin/varnishtest/tests"
+
 	grep -l ':test-result: FAIL' "$LOGDIR"/*.trs |
 	while read trs
 	do



More information about the varnish-commit mailing list