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

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

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
 

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' "" ""

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

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' "" ""