[Spice-devel] [spice-streaming-agent v2] tests: Fix hexdump.sh when builddir != srcdir

Christophe Fergeau cfergeau at redhat.com
Thu Nov 9 12:40:01 UTC 2017


This script currently expects the reference file and the generated file
to both be in the same directory, which is not the case when doing a
build with builddir != srcdir (or when running make distcheck)

Signed-off-by: Christophe Fergeau <cfergeau at redhat.com>
Acked-by: Frediano Ziglio <fziglio at redhat.com>
---
 src/unittests/hexdump.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/unittests/hexdump.sh b/src/unittests/hexdump.sh
index 602b501..691b264 100755
--- a/src/unittests/hexdump.sh
+++ b/src/unittests/hexdump.sh
@@ -2,14 +2,17 @@
 
 set -e
 
+SRCDIR=`dirname $0`
+
 # avoid weird language handling which could affect
 # ascii part of the dump
 export LANG=C
 
-for f in hexdump*.in; do
-    out=`echo $f | sed 's,\.in,.out,'`
-    rm -f $out.test
-    ./test-hexdump $out.test < $f
-    cmp $out.test $out
-    rm -f $out.test
+for f in "$SRCDIR"/hexdump*.in; do
+    reference=`echo $f | sed 's,\.in,.out,'`
+    out=`basename $reference`.test
+    rm -f $out
+    ./test-hexdump $out < $f
+    cmp $out $reference
+    rm -f $out
 done
-- 
2.13.6



More information about the Spice-devel mailing list