From: Karel Zak Date: Fri, 11 Sep 2009 10:20:28 +0000 (+0200) Subject: tests: rename blkid/images to blkid/images-fs X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e30325b7983ef5919ddee82e95bca00ac197a7e;p=util-linux tests: rename blkid/images to blkid/images-fs Signed-off-by: Karel Zak --- diff --git a/tests/ts/blkid/images/cramfs.img.bz2 b/tests/ts/blkid/images-fs/cramfs.img.bz2 similarity index 100% rename from tests/ts/blkid/images/cramfs.img.bz2 rename to 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 similarity index 100% rename from tests/ts/blkid/images/ddf-raid.img.bz2 rename to 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 similarity index 100% rename from tests/ts/blkid/images/ext2.img.bz2 rename to 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 similarity index 100% rename from tests/ts/blkid/images/ext3.img.bz2 rename to 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 similarity index 100% rename from tests/ts/blkid/images/fat.img.bz2 rename to 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 similarity index 100% rename from tests/ts/blkid/images/fat32_label_64MB.img.bz2 rename to 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 similarity index 100% rename from tests/ts/blkid/images/gfs2.img.bz2 rename to 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 similarity index 100% rename from tests/ts/blkid/images/hfs.img.bz2 rename to 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 similarity index 100% rename from tests/ts/blkid/images/hfsplus.img.bz2 rename to 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 similarity index 100% rename from tests/ts/blkid/images/hpfs.img.bz2 rename to 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 similarity index 100% rename from tests/ts/blkid/images/jbd.img.bz2 rename to 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 similarity index 100% rename from tests/ts/blkid/images/jfs.img.bz2 rename to 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 similarity index 100% rename from tests/ts/blkid/images/lvm2.img.bz2 rename to 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 similarity index 100% rename from tests/ts/blkid/images/mdraid.img.bz2 rename to 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 similarity index 100% rename from tests/ts/blkid/images/minix.img.bz2 rename to 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 similarity index 100% rename from tests/ts/blkid/images/netware.img.bz2 rename to 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 similarity index 100% rename from tests/ts/blkid/images/ocfs2.img.bz2 rename to 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 similarity index 100% rename from tests/ts/blkid/images/reiser3.img.bz2 rename to 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 similarity index 100% rename from tests/ts/blkid/images/reiser4.img.bz2 rename to 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 similarity index 100% rename from tests/ts/blkid/images/romfs.img.bz2 rename to 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 similarity index 100% rename from tests/ts/blkid/images/small-fat32.img.bz2 rename to 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 similarity index 100% rename from tests/ts/blkid/images/swap0.img.bz2 rename to 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 similarity index 100% rename from tests/ts/blkid/images/swap1.img.bz2 rename to 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 similarity index 100% rename from tests/ts/blkid/images/udf.img.bz2 rename to 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 similarity index 100% rename from tests/ts/blkid/images/xfs.img.bz2 rename to 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 similarity index 100% rename from tests/ts/blkid/images/zfs.img.bz2 rename to 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