From 1ffa7f45eb4fe3b73f94e69c929ad311d9c44b81 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Wed, 23 Mar 2016 03:44:51 -0500 Subject: 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/blkid/cramfs.bz2 | Bin 121 -> 0 bytes tests/blkid/ext2.bz2 | Bin 2396 -> 0 bytes tests/blkid/ext3.bz2 | Bin 4132 -> 0 bytes tests/blkid/ext4.bz2 | Bin 2491 -> 0 bytes tests/blkid/f2fs.bz2 | Bin 634 -> 0 bytes tests/blkid/minix.bz2 | Bin 157 -> 0 bytes tests/blkid/msdos.bz2 | Bin 288 -> 0 bytes tests/blkid/ntfs.bz2 | Bin 35854 -> 0 bytes tests/blkid/reiser3.bz2 | Bin 329 -> 0 bytes tests/blkid/squashfs.bz2 | Bin 158 -> 0 bytes tests/blkid/vfat.bz2 | Bin 291 -> 0 bytes tests/blkid/xfs.bz2 | Bin 437 -> 0 bytes tests/bzcat.test | 2 +- tests/files/blkid/cramfs.bz2 | Bin 0 -> 121 bytes tests/files/blkid/ext2.bz2 | Bin 0 -> 2396 bytes tests/files/blkid/ext3.bz2 | Bin 0 -> 4132 bytes tests/files/blkid/ext4.bz2 | Bin 0 -> 2491 bytes tests/files/blkid/f2fs.bz2 | Bin 0 -> 634 bytes tests/files/blkid/minix.bz2 | Bin 0 -> 157 bytes tests/files/blkid/msdos.bz2 | Bin 0 -> 288 bytes tests/files/blkid/ntfs.bz2 | Bin 0 -> 35854 bytes tests/files/blkid/reiser3.bz2 | Bin 0 -> 329 bytes tests/files/blkid/squashfs.bz2 | Bin 0 -> 158 bytes tests/files/blkid/vfat.bz2 | Bin 0 -> 291 bytes tests/files/blkid/xfs.bz2 | Bin 0 -> 437 bytes tests/fstype.test | 2 +- 28 files changed, 5 insertions(+), 4 deletions(-) delete mode 100644 tests/blkid/cramfs.bz2 delete mode 100644 tests/blkid/ext2.bz2 delete mode 100644 tests/blkid/ext3.bz2 delete mode 100644 tests/blkid/ext4.bz2 delete mode 100644 tests/blkid/f2fs.bz2 delete mode 100644 tests/blkid/minix.bz2 delete mode 100644 tests/blkid/msdos.bz2 delete mode 100644 tests/blkid/ntfs.bz2 delete mode 100644 tests/blkid/reiser3.bz2 delete mode 100644 tests/blkid/squashfs.bz2 delete mode 100644 tests/blkid/vfat.bz2 delete mode 100644 tests/blkid/xfs.bz2 create mode 100644 tests/files/blkid/cramfs.bz2 create mode 100644 tests/files/blkid/ext2.bz2 create mode 100644 tests/files/blkid/ext3.bz2 create mode 100644 tests/files/blkid/ext4.bz2 create mode 100644 tests/files/blkid/f2fs.bz2 create mode 100644 tests/files/blkid/minix.bz2 create mode 100644 tests/files/blkid/msdos.bz2 create mode 100644 tests/files/blkid/ntfs.bz2 create mode 100644 tests/files/blkid/reiser3.bz2 create mode 100644 tests/files/blkid/squashfs.bz2 create mode 100644 tests/files/blkid/vfat.bz2 create mode 100644 tests/files/blkid/xfs.bz2 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/blkid/cramfs.bz2 b/tests/blkid/cramfs.bz2 deleted file mode 100644 index 37438fe8..00000000 Binary files a/tests/blkid/cramfs.bz2 and /dev/null differ diff --git a/tests/blkid/ext2.bz2 b/tests/blkid/ext2.bz2 deleted file mode 100644 index e27c4d76..00000000 Binary files a/tests/blkid/ext2.bz2 and /dev/null differ diff --git a/tests/blkid/ext3.bz2 b/tests/blkid/ext3.bz2 deleted file mode 100644 index be7f11f2..00000000 Binary files a/tests/blkid/ext3.bz2 and /dev/null differ diff --git a/tests/blkid/ext4.bz2 b/tests/blkid/ext4.bz2 deleted file mode 100644 index a8314f91..00000000 Binary files a/tests/blkid/ext4.bz2 and /dev/null differ diff --git a/tests/blkid/f2fs.bz2 b/tests/blkid/f2fs.bz2 deleted file mode 100644 index 4111e876..00000000 Binary files a/tests/blkid/f2fs.bz2 and /dev/null differ diff --git a/tests/blkid/minix.bz2 b/tests/blkid/minix.bz2 deleted file mode 100644 index b2f022e0..00000000 Binary files a/tests/blkid/minix.bz2 and /dev/null differ diff --git a/tests/blkid/msdos.bz2 b/tests/blkid/msdos.bz2 deleted file mode 100644 index 26c9b665..00000000 Binary files a/tests/blkid/msdos.bz2 and /dev/null differ diff --git a/tests/blkid/ntfs.bz2 b/tests/blkid/ntfs.bz2 deleted file mode 100644 index b654ecd6..00000000 Binary files a/tests/blkid/ntfs.bz2 and /dev/null differ diff --git a/tests/blkid/reiser3.bz2 b/tests/blkid/reiser3.bz2 deleted file mode 100644 index b2adfc85..00000000 Binary files a/tests/blkid/reiser3.bz2 and /dev/null differ diff --git a/tests/blkid/squashfs.bz2 b/tests/blkid/squashfs.bz2 deleted file mode 100644 index 2f1b7937..00000000 Binary files a/tests/blkid/squashfs.bz2 and /dev/null differ diff --git a/tests/blkid/vfat.bz2 b/tests/blkid/vfat.bz2 deleted file mode 100644 index 1df8b89a..00000000 Binary files a/tests/blkid/vfat.bz2 and /dev/null differ diff --git a/tests/blkid/xfs.bz2 b/tests/blkid/xfs.bz2 deleted file mode 100644 index a7571960..00000000 Binary files a/tests/blkid/xfs.bz2 and /dev/null differ 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/files/blkid/cramfs.bz2 b/tests/files/blkid/cramfs.bz2 new file mode 100644 index 00000000..37438fe8 Binary files /dev/null and b/tests/files/blkid/cramfs.bz2 differ diff --git a/tests/files/blkid/ext2.bz2 b/tests/files/blkid/ext2.bz2 new file mode 100644 index 00000000..e27c4d76 Binary files /dev/null and b/tests/files/blkid/ext2.bz2 differ diff --git a/tests/files/blkid/ext3.bz2 b/tests/files/blkid/ext3.bz2 new file mode 100644 index 00000000..be7f11f2 Binary files /dev/null and b/tests/files/blkid/ext3.bz2 differ diff --git a/tests/files/blkid/ext4.bz2 b/tests/files/blkid/ext4.bz2 new file mode 100644 index 00000000..a8314f91 Binary files /dev/null and b/tests/files/blkid/ext4.bz2 differ diff --git a/tests/files/blkid/f2fs.bz2 b/tests/files/blkid/f2fs.bz2 new file mode 100644 index 00000000..4111e876 Binary files /dev/null and b/tests/files/blkid/f2fs.bz2 differ diff --git a/tests/files/blkid/minix.bz2 b/tests/files/blkid/minix.bz2 new file mode 100644 index 00000000..b2f022e0 Binary files /dev/null and b/tests/files/blkid/minix.bz2 differ diff --git a/tests/files/blkid/msdos.bz2 b/tests/files/blkid/msdos.bz2 new file mode 100644 index 00000000..26c9b665 Binary files /dev/null and b/tests/files/blkid/msdos.bz2 differ diff --git a/tests/files/blkid/ntfs.bz2 b/tests/files/blkid/ntfs.bz2 new file mode 100644 index 00000000..b654ecd6 Binary files /dev/null and b/tests/files/blkid/ntfs.bz2 differ diff --git a/tests/files/blkid/reiser3.bz2 b/tests/files/blkid/reiser3.bz2 new file mode 100644 index 00000000..b2adfc85 Binary files /dev/null and b/tests/files/blkid/reiser3.bz2 differ diff --git a/tests/files/blkid/squashfs.bz2 b/tests/files/blkid/squashfs.bz2 new file mode 100644 index 00000000..2f1b7937 Binary files /dev/null and b/tests/files/blkid/squashfs.bz2 differ diff --git a/tests/files/blkid/vfat.bz2 b/tests/files/blkid/vfat.bz2 new file mode 100644 index 00000000..1df8b89a Binary files /dev/null and b/tests/files/blkid/vfat.bz2 differ diff --git a/tests/files/blkid/xfs.bz2 b/tests/files/blkid/xfs.bz2 new file mode 100644 index 00000000..a7571960 Binary files /dev/null and b/tests/files/blkid/xfs.bz2 differ 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' "" "" -- cgit v1.2.3