From 1ffa7f45eb4fe3b73f94e69c929ad311d9c44b81 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Wed, 23 Mar 2016 03:44:51 -0500 Subject: [PATCH] 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 | 3 ++- tests/blkid.test | 2 +- tests/bzcat.test | 2 +- tests/{ => files}/blkid/cramfs.bz2 | Bin tests/{ => files}/blkid/ext2.bz2 | Bin tests/{ => files}/blkid/ext3.bz2 | Bin tests/{ => files}/blkid/ext4.bz2 | Bin tests/{ => files}/blkid/f2fs.bz2 | Bin tests/{ => files}/blkid/minix.bz2 | Bin tests/{ => files}/blkid/msdos.bz2 | Bin tests/{ => files}/blkid/ntfs.bz2 | Bin tests/{ => files}/blkid/reiser3.bz2 | Bin tests/{ => files}/blkid/squashfs.bz2 | Bin tests/{ => files}/blkid/vfat.bz2 | Bin tests/{ => files}/blkid/xfs.bz2 | Bin tests/fstype.test | 2 +- 16 files changed, 5 insertions(+), 4 deletions(-) rename tests/{ => files}/blkid/cramfs.bz2 (100%) rename tests/{ => files}/blkid/ext2.bz2 (100%) rename tests/{ => files}/blkid/ext3.bz2 (100%) rename tests/{ => files}/blkid/ext4.bz2 (100%) rename tests/{ => files}/blkid/f2fs.bz2 (100%) rename tests/{ => files}/blkid/minix.bz2 (100%) rename tests/{ => files}/blkid/msdos.bz2 (100%) rename tests/{ => files}/blkid/ntfs.bz2 (100%) rename tests/{ => files}/blkid/reiser3.bz2 (100%) rename tests/{ => files}/blkid/squashfs.bz2 (100%) rename tests/{ => files}/blkid/vfat.bz2 (100%) rename tests/{ => files}/blkid/xfs.bz2 (100%) 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 similarity index 100% rename from tests/blkid/cramfs.bz2 rename to tests/files/blkid/cramfs.bz2 diff --git a/tests/blkid/ext2.bz2 b/tests/files/blkid/ext2.bz2 similarity index 100% rename from tests/blkid/ext2.bz2 rename to tests/files/blkid/ext2.bz2 diff --git a/tests/blkid/ext3.bz2 b/tests/files/blkid/ext3.bz2 similarity index 100% rename from tests/blkid/ext3.bz2 rename to tests/files/blkid/ext3.bz2 diff --git a/tests/blkid/ext4.bz2 b/tests/files/blkid/ext4.bz2 similarity index 100% rename from tests/blkid/ext4.bz2 rename to tests/files/blkid/ext4.bz2 diff --git a/tests/blkid/f2fs.bz2 b/tests/files/blkid/f2fs.bz2 similarity index 100% rename from tests/blkid/f2fs.bz2 rename to tests/files/blkid/f2fs.bz2 diff --git a/tests/blkid/minix.bz2 b/tests/files/blkid/minix.bz2 similarity index 100% rename from tests/blkid/minix.bz2 rename to tests/files/blkid/minix.bz2 diff --git a/tests/blkid/msdos.bz2 b/tests/files/blkid/msdos.bz2 similarity index 100% rename from tests/blkid/msdos.bz2 rename to tests/files/blkid/msdos.bz2 diff --git a/tests/blkid/ntfs.bz2 b/tests/files/blkid/ntfs.bz2 similarity index 100% rename from tests/blkid/ntfs.bz2 rename to tests/files/blkid/ntfs.bz2 diff --git a/tests/blkid/reiser3.bz2 b/tests/files/blkid/reiser3.bz2 similarity index 100% rename from tests/blkid/reiser3.bz2 rename to tests/files/blkid/reiser3.bz2 diff --git a/tests/blkid/squashfs.bz2 b/tests/files/blkid/squashfs.bz2 similarity index 100% rename from tests/blkid/squashfs.bz2 rename to tests/files/blkid/squashfs.bz2 diff --git a/tests/blkid/vfat.bz2 b/tests/files/blkid/vfat.bz2 similarity index 100% rename from tests/blkid/vfat.bz2 rename to tests/files/blkid/vfat.bz2 diff --git a/tests/blkid/xfs.bz2 b/tests/files/blkid/xfs.bz2 similarity index 100% rename from tests/blkid/xfs.bz2 rename to 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' "" ""