Fix bzcat.test (as noted by Andy Chu), wean tests off $TOPDIR and supply $FILES

instead, move tests/blkid into tests/files/blkid.

16 files changed, 5 insertions, 4 deletions

diff --git a/scripts/test.sh b/scripts/test.sh
index 0c3d7aaf..1337c529 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-[ -z "$TOPDIR" ] && TOPDIR="$(pwd)"
+TOPDIR="$PWD"
+FILES="$PWD"/tests/files
 
 trap 'kill $(jobs -p) 2>/dev/null; exit 1' INT
 
diff --git a/tests/blkid.test b/tests/blkid.test
index c99b2a42..d3bf6a1f 100755
--- a/tests/blkid.test
+++ b/tests/blkid.test
@@ -4,7 +4,7 @@
 
 #testing "name" "command" "result" "infile" "stdin"
 
-BDIR="$TOPDIR/tests/blkid"
+BDIR="$FILES/blkid"
 
 bzcat "$BDIR"/squashfs.bz2 > temp.img
 testing "file" "blkid temp.img" 'temp.img: TYPE="squashfs"\n' "" ""
diff --git a/tests/bzcat.test b/tests/bzcat.test
index ef1b07f5..f57a2f88 100755
--- a/tests/bzcat.test
+++ b/tests/bzcat.test
@@ -7,7 +7,7 @@
 
 #testing "name" "command" "result" "infile" "stdin"
 testing "overflow" \
-  'bzcat "$TOPDIR/files/bzcat/overflow.bz2" >/dev/null 2>/dev/null;
+  'bzcat "$FILES/bzcat/overflow.bz2" >/dev/null 2>/dev/null ;
    [ $? -eq 1 ] && echo good' "good\n" "" ""
 
 echo "hello" > file
diff --git a/tests/blkid/cramfs.bz2 b/tests/files/blkid/cramfs.bz2
index 37438fe8..37438fe8 100644
--- a/tests/blkid/cramfs.bz2
+++ b/tests/files/blkid/cramfs.bz2
diff --git a/tests/blkid/ext2.bz2 b/tests/files/blkid/ext2.bz2
index e27c4d76..e27c4d76 100644
--- a/tests/blkid/ext2.bz2
+++ b/tests/files/blkid/ext2.bz2
diff --git a/tests/blkid/ext3.bz2 b/tests/files/blkid/ext3.bz2
index be7f11f2..be7f11f2 100644
--- a/tests/blkid/ext3.bz2
+++ b/tests/files/blkid/ext3.bz2
diff --git a/tests/blkid/ext4.bz2 b/tests/files/blkid/ext4.bz2
index a8314f91..a8314f91 100644
--- a/tests/blkid/ext4.bz2
+++ b/tests/files/blkid/ext4.bz2
diff --git a/tests/blkid/f2fs.bz2 b/tests/files/blkid/f2fs.bz2
index 4111e876..4111e876 100644
--- a/tests/blkid/f2fs.bz2
+++ b/tests/files/blkid/f2fs.bz2
diff --git a/tests/blkid/minix.bz2 b/tests/files/blkid/minix.bz2
index b2f022e0..b2f022e0 100644
--- a/tests/blkid/minix.bz2
+++ b/tests/files/blkid/minix.bz2
diff --git a/tests/blkid/msdos.bz2 b/tests/files/blkid/msdos.bz2
index 26c9b665..26c9b665 100644
--- a/tests/blkid/msdos.bz2
+++ b/tests/files/blkid/msdos.bz2
diff --git a/tests/blkid/ntfs.bz2 b/tests/files/blkid/ntfs.bz2
index b654ecd6..b654ecd6 100644
--- a/tests/blkid/ntfs.bz2
+++ b/tests/files/blkid/ntfs.bz2
diff --git a/tests/blkid/reiser3.bz2 b/tests/files/blkid/reiser3.bz2
index b2adfc85..b2adfc85 100644
--- a/tests/blkid/reiser3.bz2
+++ b/tests/files/blkid/reiser3.bz2
diff --git a/tests/blkid/squashfs.bz2 b/tests/files/blkid/squashfs.bz2
index 2f1b7937..2f1b7937 100644
--- a/tests/blkid/squashfs.bz2
+++ b/tests/files/blkid/squashfs.bz2
diff --git a/tests/blkid/vfat.bz2 b/tests/files/blkid/vfat.bz2
index 1df8b89a..1df8b89a 100644
--- a/tests/blkid/vfat.bz2
+++ b/tests/files/blkid/vfat.bz2
diff --git a/tests/blkid/xfs.bz2 b/tests/files/blkid/xfs.bz2
index a7571960..a7571960 100644
--- a/tests/blkid/xfs.bz2
+++ b/tests/files/blkid/xfs.bz2
diff --git a/tests/fstype.test b/tests/fstype.test
index cc7a6206..3df26b19 100755
--- a/tests/fstype.test
+++ b/tests/fstype.test
@@ -4,7 +4,7 @@
 
 #testing "name" "command" "result" "infile" "stdin"
 
-BDIR="$TOPDIR/tests/blkid"
+BDIR="$FILES/blkid"
 
 bzcat "$BDIR"/squashfs.bz2 > temp.img
 testing "file" "fstype temp.img" 'squashfs\n' "" ""