Update build systems

2 files changed, 16 insertions, 14 deletions

diff --git a/tests/compatibility_test.sh b/tests/compatibility_test.sh
index 6085ff7..d21e14a 100755
--- a/tests/compatibility_test.sh
+++ b/tests/compatibility_test.sh
@@ -5,12 +5,14 @@
 
 set -o errexit
 
-BRO=../bin/bro
+BRO=bin/bro
+TMP_DIR=bin/tmp
 
-for file in testdata/*.compressed*; do
+for file in tests/testdata/*.compressed*; do
   echo "Testing decompression of file $file"
   expected=${file%.compressed*}
-  uncompressed=${expected}.uncompressed
+  uncompressed=${TMP_DIR}/${expected##*/}.uncompressed
+  echo $uncompressed
   $BRO -f -d -i $file -o $uncompressed
   diff -q $uncompressed $expected
   # Test the streaming version
@@ -18,4 +20,3 @@ for file in testdata/*.compressed*; do
   diff -q $uncompressed $expected
   rm -f $uncompressed
 done
-
diff --git a/tests/roundtrip_test.sh b/tests/roundtrip_test.sh
index bfd9885..c8259c7 100755
--- a/tests/roundtrip_test.sh
+++ b/tests/roundtrip_test.sh
@@ -4,23 +4,24 @@
 
 set -o errexit
 
-BRO=../bin/bro
+BRO=bin/bro
+TMP_DIR=bin/tmp
 INPUTS="""
-testdata/alice29.txt
-testdata/asyoulik.txt
-testdata/lcet10.txt
-testdata/plrabn12.txt
-../enc/encode.c
-../common/dictionary.h
-../dec/decode.c
+tests/testdata/alice29.txt
+tests/testdata/asyoulik.txt
+tests/testdata/lcet10.txt
+tests/testdata/plrabn12.txt
+enc/encode.c
+common/dictionary.h
+dec/decode.c
 $BRO
 """
 
 for file in $INPUTS; do
   for quality in 1 6 9 11; do
     echo "Roundtrip testing $file at quality $quality"
-    compressed=${file}.bro
-    uncompressed=${file}.unbro
+    compressed=${TMP_DIR}/${file##*/}.bro
+    uncompressed=${TMP_DIR}/${file##*/}.unbro
     $BRO -f -q $quality -i $file -o $compressed
     $BRO -f -d -i $compressed -o $uncompressed
     diff -q $file $uncompressed