tests: rename blkid/images to blkid/images-fs

Signed-off-by: Karel Zak <kzak@redhat.com>

27 files changed, 7 insertions, 4 deletions

diff --git a/tests/ts/blkid/images/cramfs.img.bz2 b/tests/ts/blkid/images-fs/cramfs.img.bz2
index d6381168..d6381168 100644
--- a/tests/ts/blkid/images/cramfs.img.bz2
+++ b/tests/ts/blkid/images-fs/cramfs.img.bz2
diff --git a/tests/ts/blkid/images/ddf-raid.img.bz2 b/tests/ts/blkid/images-fs/ddf-raid.img.bz2
index 1dc48925..1dc48925 100644
--- a/tests/ts/blkid/images/ddf-raid.img.bz2
+++ b/tests/ts/blkid/images-fs/ddf-raid.img.bz2
diff --git a/tests/ts/blkid/images/ext2.img.bz2 b/tests/ts/blkid/images-fs/ext2.img.bz2
index d1811ce3..d1811ce3 100644
--- a/tests/ts/blkid/images/ext2.img.bz2
+++ b/tests/ts/blkid/images-fs/ext2.img.bz2
diff --git a/tests/ts/blkid/images/ext3.img.bz2 b/tests/ts/blkid/images-fs/ext3.img.bz2
index 53945986..53945986 100644
--- a/tests/ts/blkid/images/ext3.img.bz2
+++ b/tests/ts/blkid/images-fs/ext3.img.bz2
diff --git a/tests/ts/blkid/images/fat.img.bz2 b/tests/ts/blkid/images-fs/fat.img.bz2
index 1fa7f2d9..1fa7f2d9 100644
--- a/tests/ts/blkid/images/fat.img.bz2
+++ b/tests/ts/blkid/images-fs/fat.img.bz2
diff --git a/tests/ts/blkid/images/fat32_label_64MB.img.bz2 b/tests/ts/blkid/images-fs/fat32_label_64MB.img.bz2
index ca762938..ca762938 100644
--- a/tests/ts/blkid/images/fat32_label_64MB.img.bz2
+++ b/tests/ts/blkid/images-fs/fat32_label_64MB.img.bz2
diff --git a/tests/ts/blkid/images/gfs2.img.bz2 b/tests/ts/blkid/images-fs/gfs2.img.bz2
index e465df50..e465df50 100644
--- a/tests/ts/blkid/images/gfs2.img.bz2
+++ b/tests/ts/blkid/images-fs/gfs2.img.bz2
diff --git a/tests/ts/blkid/images/hfs.img.bz2 b/tests/ts/blkid/images-fs/hfs.img.bz2
index d4fc1ab4..d4fc1ab4 100644
--- a/tests/ts/blkid/images/hfs.img.bz2
+++ b/tests/ts/blkid/images-fs/hfs.img.bz2
diff --git a/tests/ts/blkid/images/hfsplus.img.bz2 b/tests/ts/blkid/images-fs/hfsplus.img.bz2
index b6ad1b97..b6ad1b97 100644
--- a/tests/ts/blkid/images/hfsplus.img.bz2
+++ b/tests/ts/blkid/images-fs/hfsplus.img.bz2
diff --git a/tests/ts/blkid/images/hpfs.img.bz2 b/tests/ts/blkid/images-fs/hpfs.img.bz2
index a54e6dfc..a54e6dfc 100644
--- a/tests/ts/blkid/images/hpfs.img.bz2
+++ b/tests/ts/blkid/images-fs/hpfs.img.bz2
diff --git a/tests/ts/blkid/images/jbd.img.bz2 b/tests/ts/blkid/images-fs/jbd.img.bz2
index f0d7f918..f0d7f918 100644
--- a/tests/ts/blkid/images/jbd.img.bz2
+++ b/tests/ts/blkid/images-fs/jbd.img.bz2
diff --git a/tests/ts/blkid/images/jfs.img.bz2 b/tests/ts/blkid/images-fs/jfs.img.bz2
index 1d4d249e..1d4d249e 100644
--- a/tests/ts/blkid/images/jfs.img.bz2
+++ b/tests/ts/blkid/images-fs/jfs.img.bz2
diff --git a/tests/ts/blkid/images/lvm2.img.bz2 b/tests/ts/blkid/images-fs/lvm2.img.bz2
index a699b84b..a699b84b 100644
--- a/tests/ts/blkid/images/lvm2.img.bz2
+++ b/tests/ts/blkid/images-fs/lvm2.img.bz2
diff --git a/tests/ts/blkid/images/mdraid.img.bz2 b/tests/ts/blkid/images-fs/mdraid.img.bz2
index d5a67a34..d5a67a34 100644
--- a/tests/ts/blkid/images/mdraid.img.bz2
+++ b/tests/ts/blkid/images-fs/mdraid.img.bz2
diff --git a/tests/ts/blkid/images/minix.img.bz2 b/tests/ts/blkid/images-fs/minix.img.bz2
index d11f3a88..d11f3a88 100644
--- a/tests/ts/blkid/images/minix.img.bz2
+++ b/tests/ts/blkid/images-fs/minix.img.bz2
diff --git a/tests/ts/blkid/images/netware.img.bz2 b/tests/ts/blkid/images-fs/netware.img.bz2
index 9c206730..9c206730 100644
--- a/tests/ts/blkid/images/netware.img.bz2
+++ b/tests/ts/blkid/images-fs/netware.img.bz2
diff --git a/tests/ts/blkid/images/ocfs2.img.bz2 b/tests/ts/blkid/images-fs/ocfs2.img.bz2
index 0bad915f..0bad915f 100644
--- a/tests/ts/blkid/images/ocfs2.img.bz2
+++ b/tests/ts/blkid/images-fs/ocfs2.img.bz2
diff --git a/tests/ts/blkid/images/reiser3.img.bz2 b/tests/ts/blkid/images-fs/reiser3.img.bz2
index 1802bc21..1802bc21 100644
--- a/tests/ts/blkid/images/reiser3.img.bz2
+++ b/tests/ts/blkid/images-fs/reiser3.img.bz2
diff --git a/tests/ts/blkid/images/reiser4.img.bz2 b/tests/ts/blkid/images-fs/reiser4.img.bz2
index b50d12e4..b50d12e4 100644
--- a/tests/ts/blkid/images/reiser4.img.bz2
+++ b/tests/ts/blkid/images-fs/reiser4.img.bz2
diff --git a/tests/ts/blkid/images/romfs.img.bz2 b/tests/ts/blkid/images-fs/romfs.img.bz2
index b5e31099..b5e31099 100644
--- a/tests/ts/blkid/images/romfs.img.bz2
+++ b/tests/ts/blkid/images-fs/romfs.img.bz2
diff --git a/tests/ts/blkid/images/small-fat32.img.bz2 b/tests/ts/blkid/images-fs/small-fat32.img.bz2
index 8b90f9c3..8b90f9c3 100644
--- a/tests/ts/blkid/images/small-fat32.img.bz2
+++ b/tests/ts/blkid/images-fs/small-fat32.img.bz2
diff --git a/tests/ts/blkid/images/swap0.img.bz2 b/tests/ts/blkid/images-fs/swap0.img.bz2
index e61e375b..e61e375b 100644
--- a/tests/ts/blkid/images/swap0.img.bz2
+++ b/tests/ts/blkid/images-fs/swap0.img.bz2
diff --git a/tests/ts/blkid/images/swap1.img.bz2 b/tests/ts/blkid/images-fs/swap1.img.bz2
index fbab9edb..fbab9edb 100644
--- a/tests/ts/blkid/images/swap1.img.bz2
+++ b/tests/ts/blkid/images-fs/swap1.img.bz2
diff --git a/tests/ts/blkid/images/udf.img.bz2 b/tests/ts/blkid/images-fs/udf.img.bz2
index bd2deb0a..bd2deb0a 100644
--- a/tests/ts/blkid/images/udf.img.bz2
+++ b/tests/ts/blkid/images-fs/udf.img.bz2
diff --git a/tests/ts/blkid/images/xfs.img.bz2 b/tests/ts/blkid/images-fs/xfs.img.bz2
index cf6982b4..cf6982b4 100644
--- a/tests/ts/blkid/images/xfs.img.bz2
+++ b/tests/ts/blkid/images-fs/xfs.img.bz2
diff --git a/tests/ts/blkid/images/zfs.img.bz2 b/tests/ts/blkid/images-fs/zfs.img.bz2
index 92f445a3..92f445a3 100644
--- a/tests/ts/blkid/images/zfs.img.bz2
+++ b/tests/ts/blkid/images-fs/zfs.img.bz2
diff --git a/tests/ts/blkid/low-probe b/tests/ts/blkid/low-probe
index 38afe525..1dfcbed4 100755
--- a/tests/ts/blkid/low-probe
+++ b/tests/ts/blkid/low-probe
@@ -17,7 +17,7 @@
 #
 
 TS_TOPDIR="$(dirname $0)/../.."
-TS_DESC="low-probe"
+TS_DESC="low-level probing"
 
 . $TS_TOPDIR/functions.sh
 
@@ -27,11 +27,14 @@ if [ ! -x "$TS_CMD_BLKID" ]; then
 	ts_skip "blkid disabled"
 fi
 
-mkdir -p $TS_OUTDIR/images
+#
+# Superblocks
+#
+mkdir -p $TS_OUTDIR/images-fs
 
-for img in $(ls $TS_SELF/images/*.img.bz2 | sort); do
+for img in $(ls $TS_SELF/images-fs/*.img.bz2 | sort); do
 	name=$(basename $img .img.bz2)
-	outimg=$TS_OUTDIR/images/${name}.img
+	outimg=$TS_OUTDIR/images-fs/${name}.img
 
 	ts_init_subtest $name