From: Ruediger Meier Date: Mon, 7 Dec 2015 16:48:56 +0000 (+0100) Subject: tests: use xz instead of bzip2 for blkid images X-Git-Tag: v2.28-rc1~228^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=84918ad0fcc03d065dbe238459cc31b26225420f;p=thirdparty%2Futil-linux.git tests: use xz instead of bzip2 for blkid images xz decompression creates sparse files if possible. This saves about 1G disk space in build directory and a lot I/O and time. BTW regarding compatibility ... CentOS 7 is the first system I've met which does not install bzip2 but xz only by default. Signed-off-by: Ruediger Meier --- diff --git a/tests/ts/blkid/images-fs/adaptec-raid.img.bz2 b/tests/ts/blkid/images-fs/adaptec-raid.img.bz2 deleted file mode 100644 index d3c10d793a..0000000000 Binary files a/tests/ts/blkid/images-fs/adaptec-raid.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/adaptec-raid.img.xz b/tests/ts/blkid/images-fs/adaptec-raid.img.xz new file mode 100644 index 0000000000..20387cdded Binary files /dev/null and b/tests/ts/blkid/images-fs/adaptec-raid.img.xz differ diff --git a/tests/ts/blkid/images-fs/bcache-B.img.bz2 b/tests/ts/blkid/images-fs/bcache-B.img.bz2 deleted file mode 100644 index 71fe1eeb73..0000000000 Binary files a/tests/ts/blkid/images-fs/bcache-B.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/bcache-B.img.xz b/tests/ts/blkid/images-fs/bcache-B.img.xz new file mode 100644 index 0000000000..ed187f113a Binary files /dev/null and b/tests/ts/blkid/images-fs/bcache-B.img.xz differ diff --git a/tests/ts/blkid/images-fs/bcache-C.img.bz2 b/tests/ts/blkid/images-fs/bcache-C.img.bz2 deleted file mode 100644 index 97afedbae8..0000000000 Binary files a/tests/ts/blkid/images-fs/bcache-C.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/bcache-C.img.xz b/tests/ts/blkid/images-fs/bcache-C.img.xz new file mode 100644 index 0000000000..af90cbfd33 Binary files /dev/null and b/tests/ts/blkid/images-fs/bcache-C.img.xz differ diff --git a/tests/ts/blkid/images-fs/befs.img.bz2 b/tests/ts/blkid/images-fs/befs.img.bz2 deleted file mode 100644 index f4deaec4c3..0000000000 Binary files a/tests/ts/blkid/images-fs/befs.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/befs.img.xz b/tests/ts/blkid/images-fs/befs.img.xz new file mode 100644 index 0000000000..188a6e8e83 Binary files /dev/null and b/tests/ts/blkid/images-fs/befs.img.xz differ diff --git a/tests/ts/blkid/images-fs/bfs.img.bz2 b/tests/ts/blkid/images-fs/bfs.img.bz2 deleted file mode 100644 index 54df48f77a..0000000000 Binary files a/tests/ts/blkid/images-fs/bfs.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/bfs.img.xz b/tests/ts/blkid/images-fs/bfs.img.xz new file mode 100644 index 0000000000..98f024ab4f Binary files /dev/null and b/tests/ts/blkid/images-fs/bfs.img.xz differ diff --git a/tests/ts/blkid/images-fs/cramfs.img.bz2 b/tests/ts/blkid/images-fs/cramfs.img.bz2 deleted file mode 100644 index d6381168f1..0000000000 Binary files a/tests/ts/blkid/images-fs/cramfs.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/cramfs.img.xz b/tests/ts/blkid/images-fs/cramfs.img.xz new file mode 100644 index 0000000000..5943867995 Binary files /dev/null and b/tests/ts/blkid/images-fs/cramfs.img.xz differ diff --git a/tests/ts/blkid/images-fs/ddf-raid.img.bz2 b/tests/ts/blkid/images-fs/ddf-raid.img.bz2 deleted file mode 100644 index b093493378..0000000000 Binary files a/tests/ts/blkid/images-fs/ddf-raid.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/ddf-raid.img.xz b/tests/ts/blkid/images-fs/ddf-raid.img.xz new file mode 100644 index 0000000000..b5b64fe47d Binary files /dev/null and b/tests/ts/blkid/images-fs/ddf-raid.img.xz differ diff --git a/tests/ts/blkid/images-fs/drbdmanage-control-volume.img.bz2 b/tests/ts/blkid/images-fs/drbdmanage-control-volume.img.bz2 deleted file mode 100644 index 6979055449..0000000000 Binary files a/tests/ts/blkid/images-fs/drbdmanage-control-volume.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/drbdmanage-control-volume.img.xz b/tests/ts/blkid/images-fs/drbdmanage-control-volume.img.xz new file mode 100644 index 0000000000..d31bfc1755 Binary files /dev/null and b/tests/ts/blkid/images-fs/drbdmanage-control-volume.img.xz differ diff --git a/tests/ts/blkid/images-fs/exfat.img.bz2 b/tests/ts/blkid/images-fs/exfat.img.bz2 deleted file mode 100644 index f96c3f06e6..0000000000 Binary files a/tests/ts/blkid/images-fs/exfat.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/exfat.img.xz b/tests/ts/blkid/images-fs/exfat.img.xz new file mode 100644 index 0000000000..43cc09a7c4 Binary files /dev/null and b/tests/ts/blkid/images-fs/exfat.img.xz differ diff --git a/tests/ts/blkid/images-fs/ext2.img.bz2 b/tests/ts/blkid/images-fs/ext2.img.bz2 deleted file mode 100644 index d1811ce3d2..0000000000 Binary files a/tests/ts/blkid/images-fs/ext2.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/ext2.img.xz b/tests/ts/blkid/images-fs/ext2.img.xz new file mode 100644 index 0000000000..3b5489f1a0 Binary files /dev/null and b/tests/ts/blkid/images-fs/ext2.img.xz differ diff --git a/tests/ts/blkid/images-fs/ext3.img.bz2 b/tests/ts/blkid/images-fs/ext3.img.bz2 deleted file mode 100644 index 5394598693..0000000000 Binary files a/tests/ts/blkid/images-fs/ext3.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/ext3.img.xz b/tests/ts/blkid/images-fs/ext3.img.xz new file mode 100644 index 0000000000..7d170e2c26 Binary files /dev/null and b/tests/ts/blkid/images-fs/ext3.img.xz differ diff --git a/tests/ts/blkid/images-fs/f2fs.img.bz2 b/tests/ts/blkid/images-fs/f2fs.img.bz2 deleted file mode 100644 index 82e86013d8..0000000000 Binary files a/tests/ts/blkid/images-fs/f2fs.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/f2fs.img.xz b/tests/ts/blkid/images-fs/f2fs.img.xz new file mode 100644 index 0000000000..f7f9dde999 Binary files /dev/null and b/tests/ts/blkid/images-fs/f2fs.img.xz differ diff --git a/tests/ts/blkid/images-fs/fat.img.bz2 b/tests/ts/blkid/images-fs/fat.img.bz2 deleted file mode 100644 index 1fa7f2d9f2..0000000000 Binary files a/tests/ts/blkid/images-fs/fat.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/fat.img.xz b/tests/ts/blkid/images-fs/fat.img.xz new file mode 100644 index 0000000000..4e0997a5aa Binary files /dev/null and b/tests/ts/blkid/images-fs/fat.img.xz differ diff --git a/tests/ts/blkid/images-fs/fat16_noheads.img.bz2 b/tests/ts/blkid/images-fs/fat16_noheads.img.bz2 deleted file mode 100644 index 4d3d26c8cb..0000000000 Binary files a/tests/ts/blkid/images-fs/fat16_noheads.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/fat16_noheads.img.xz b/tests/ts/blkid/images-fs/fat16_noheads.img.xz new file mode 100644 index 0000000000..a0ee296408 Binary files /dev/null and b/tests/ts/blkid/images-fs/fat16_noheads.img.xz differ diff --git a/tests/ts/blkid/images-fs/fat32_label_64MB.img.bz2 b/tests/ts/blkid/images-fs/fat32_label_64MB.img.bz2 deleted file mode 100644 index ca7629380a..0000000000 Binary files a/tests/ts/blkid/images-fs/fat32_label_64MB.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/fat32_label_64MB.img.xz b/tests/ts/blkid/images-fs/fat32_label_64MB.img.xz new file mode 100644 index 0000000000..f0976bc915 Binary files /dev/null and b/tests/ts/blkid/images-fs/fat32_label_64MB.img.xz differ diff --git a/tests/ts/blkid/images-fs/gfs2.img.bz2 b/tests/ts/blkid/images-fs/gfs2.img.bz2 deleted file mode 100644 index bab2f901d3..0000000000 Binary files a/tests/ts/blkid/images-fs/gfs2.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/gfs2.img.xz b/tests/ts/blkid/images-fs/gfs2.img.xz new file mode 100644 index 0000000000..22d4d6bc3c Binary files /dev/null and b/tests/ts/blkid/images-fs/gfs2.img.xz differ diff --git a/tests/ts/blkid/images-fs/hfs.img.bz2 b/tests/ts/blkid/images-fs/hfs.img.bz2 deleted file mode 100644 index d4fc1ab456..0000000000 Binary files a/tests/ts/blkid/images-fs/hfs.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/hfs.img.xz b/tests/ts/blkid/images-fs/hfs.img.xz new file mode 100644 index 0000000000..cfa3252cd1 Binary files /dev/null and b/tests/ts/blkid/images-fs/hfs.img.xz differ diff --git a/tests/ts/blkid/images-fs/hfsplus.img.bz2 b/tests/ts/blkid/images-fs/hfsplus.img.bz2 deleted file mode 100644 index b6ad1b976b..0000000000 Binary files a/tests/ts/blkid/images-fs/hfsplus.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/hfsplus.img.xz b/tests/ts/blkid/images-fs/hfsplus.img.xz new file mode 100644 index 0000000000..1c37a70b13 Binary files /dev/null and b/tests/ts/blkid/images-fs/hfsplus.img.xz differ diff --git a/tests/ts/blkid/images-fs/hpfs.img.bz2 b/tests/ts/blkid/images-fs/hpfs.img.bz2 deleted file mode 100644 index a54e6dfcdf..0000000000 Binary files a/tests/ts/blkid/images-fs/hpfs.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/hpfs.img.xz b/tests/ts/blkid/images-fs/hpfs.img.xz new file mode 100644 index 0000000000..4e22a8e544 Binary files /dev/null and b/tests/ts/blkid/images-fs/hpfs.img.xz differ diff --git a/tests/ts/blkid/images-fs/hpt37x-raid.img.bz2 b/tests/ts/blkid/images-fs/hpt37x-raid.img.bz2 deleted file mode 100644 index 52e13bb308..0000000000 Binary files a/tests/ts/blkid/images-fs/hpt37x-raid.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/hpt37x-raid.img.xz b/tests/ts/blkid/images-fs/hpt37x-raid.img.xz new file mode 100644 index 0000000000..1b53059fb9 Binary files /dev/null and b/tests/ts/blkid/images-fs/hpt37x-raid.img.xz differ diff --git a/tests/ts/blkid/images-fs/hpt45x-raid.img.bz2 b/tests/ts/blkid/images-fs/hpt45x-raid.img.bz2 deleted file mode 100644 index 1feaa5beab..0000000000 Binary files a/tests/ts/blkid/images-fs/hpt45x-raid.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/hpt45x-raid.img.xz b/tests/ts/blkid/images-fs/hpt45x-raid.img.xz new file mode 100644 index 0000000000..7dfe68acd0 Binary files /dev/null and b/tests/ts/blkid/images-fs/hpt45x-raid.img.xz differ diff --git a/tests/ts/blkid/images-fs/iso-joliet.img.bz2 b/tests/ts/blkid/images-fs/iso-joliet.img.bz2 deleted file mode 100644 index 4e43c0b8b5..0000000000 Binary files a/tests/ts/blkid/images-fs/iso-joliet.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/iso-joliet.img.xz b/tests/ts/blkid/images-fs/iso-joliet.img.xz new file mode 100644 index 0000000000..16b896130a Binary files /dev/null and b/tests/ts/blkid/images-fs/iso-joliet.img.xz differ diff --git a/tests/ts/blkid/images-fs/iso-rr-joliet.img.bz2 b/tests/ts/blkid/images-fs/iso-rr-joliet.img.bz2 deleted file mode 100644 index 97e8b76924..0000000000 Binary files a/tests/ts/blkid/images-fs/iso-rr-joliet.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/iso-rr-joliet.img.xz b/tests/ts/blkid/images-fs/iso-rr-joliet.img.xz new file mode 100644 index 0000000000..1d6ad2c4b3 Binary files /dev/null and b/tests/ts/blkid/images-fs/iso-rr-joliet.img.xz differ diff --git a/tests/ts/blkid/images-fs/iso.img.bz2 b/tests/ts/blkid/images-fs/iso.img.bz2 deleted file mode 100644 index 43898475ef..0000000000 Binary files a/tests/ts/blkid/images-fs/iso.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/iso.img.xz b/tests/ts/blkid/images-fs/iso.img.xz new file mode 100644 index 0000000000..f1146f3a0a Binary files /dev/null and b/tests/ts/blkid/images-fs/iso.img.xz differ diff --git a/tests/ts/blkid/images-fs/isw-raid.img.bz2 b/tests/ts/blkid/images-fs/isw-raid.img.bz2 deleted file mode 100644 index 9214c96f14..0000000000 Binary files a/tests/ts/blkid/images-fs/isw-raid.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/isw-raid.img.xz b/tests/ts/blkid/images-fs/isw-raid.img.xz new file mode 100644 index 0000000000..8e5529ac00 Binary files /dev/null and b/tests/ts/blkid/images-fs/isw-raid.img.xz differ diff --git a/tests/ts/blkid/images-fs/jbd.img.bz2 b/tests/ts/blkid/images-fs/jbd.img.bz2 deleted file mode 100644 index e6c4fc4396..0000000000 Binary files a/tests/ts/blkid/images-fs/jbd.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/jbd.img.xz b/tests/ts/blkid/images-fs/jbd.img.xz new file mode 100644 index 0000000000..7c5a089bba Binary files /dev/null and b/tests/ts/blkid/images-fs/jbd.img.xz differ diff --git a/tests/ts/blkid/images-fs/jfs.img.bz2 b/tests/ts/blkid/images-fs/jfs.img.bz2 deleted file mode 100644 index 1d4d249eb1..0000000000 Binary files a/tests/ts/blkid/images-fs/jfs.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/jfs.img.xz b/tests/ts/blkid/images-fs/jfs.img.xz new file mode 100644 index 0000000000..4780f6d0a3 Binary files /dev/null and b/tests/ts/blkid/images-fs/jfs.img.xz differ diff --git a/tests/ts/blkid/images-fs/jmicron-raid.img.bz2 b/tests/ts/blkid/images-fs/jmicron-raid.img.bz2 deleted file mode 100644 index 3b4b236700..0000000000 Binary files a/tests/ts/blkid/images-fs/jmicron-raid.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/jmicron-raid.img.xz b/tests/ts/blkid/images-fs/jmicron-raid.img.xz new file mode 100644 index 0000000000..cde0811c6d Binary files /dev/null and b/tests/ts/blkid/images-fs/jmicron-raid.img.xz differ diff --git a/tests/ts/blkid/images-fs/lsi-raid.img.bz2 b/tests/ts/blkid/images-fs/lsi-raid.img.bz2 deleted file mode 100644 index ffd75c3a2e..0000000000 Binary files a/tests/ts/blkid/images-fs/lsi-raid.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/lsi-raid.img.xz b/tests/ts/blkid/images-fs/lsi-raid.img.xz new file mode 100644 index 0000000000..d6ae15aac4 Binary files /dev/null and b/tests/ts/blkid/images-fs/lsi-raid.img.xz differ diff --git a/tests/ts/blkid/images-fs/lvm2.img.bz2 b/tests/ts/blkid/images-fs/lvm2.img.bz2 deleted file mode 100644 index 7bb84bf4da..0000000000 Binary files a/tests/ts/blkid/images-fs/lvm2.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/lvm2.img.xz b/tests/ts/blkid/images-fs/lvm2.img.xz new file mode 100644 index 0000000000..4c3c183fb1 Binary files /dev/null and b/tests/ts/blkid/images-fs/lvm2.img.xz differ diff --git a/tests/ts/blkid/images-fs/mdraid.img.bz2 b/tests/ts/blkid/images-fs/mdraid.img.bz2 deleted file mode 100644 index d5a67a34dd..0000000000 Binary files a/tests/ts/blkid/images-fs/mdraid.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/mdraid.img.xz b/tests/ts/blkid/images-fs/mdraid.img.xz new file mode 100644 index 0000000000..e8ff4f55cd Binary files /dev/null and b/tests/ts/blkid/images-fs/mdraid.img.xz differ diff --git a/tests/ts/blkid/images-fs/minix-BE.img.bz2 b/tests/ts/blkid/images-fs/minix-BE.img.bz2 deleted file mode 100644 index 0730283165..0000000000 Binary files a/tests/ts/blkid/images-fs/minix-BE.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/minix-BE.img.xz b/tests/ts/blkid/images-fs/minix-BE.img.xz new file mode 100644 index 0000000000..c349a4f855 Binary files /dev/null and b/tests/ts/blkid/images-fs/minix-BE.img.xz differ diff --git a/tests/ts/blkid/images-fs/minix-LE.img.bz2 b/tests/ts/blkid/images-fs/minix-LE.img.bz2 deleted file mode 100644 index c6674c9515..0000000000 Binary files a/tests/ts/blkid/images-fs/minix-LE.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/minix-LE.img.xz b/tests/ts/blkid/images-fs/minix-LE.img.xz new file mode 100644 index 0000000000..da646a8b4b Binary files /dev/null and b/tests/ts/blkid/images-fs/minix-LE.img.xz differ diff --git a/tests/ts/blkid/images-fs/netware.img.bz2 b/tests/ts/blkid/images-fs/netware.img.bz2 deleted file mode 100644 index 9c20673044..0000000000 Binary files a/tests/ts/blkid/images-fs/netware.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/netware.img.xz b/tests/ts/blkid/images-fs/netware.img.xz new file mode 100644 index 0000000000..fe5b1030ee Binary files /dev/null and b/tests/ts/blkid/images-fs/netware.img.xz differ diff --git a/tests/ts/blkid/images-fs/nilfs2.img.bz2 b/tests/ts/blkid/images-fs/nilfs2.img.bz2 deleted file mode 100644 index a9762eb1ac..0000000000 Binary files a/tests/ts/blkid/images-fs/nilfs2.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/nilfs2.img.xz b/tests/ts/blkid/images-fs/nilfs2.img.xz new file mode 100644 index 0000000000..38de64561e Binary files /dev/null and b/tests/ts/blkid/images-fs/nilfs2.img.xz differ diff --git a/tests/ts/blkid/images-fs/ntfs.img.bz2 b/tests/ts/blkid/images-fs/ntfs.img.bz2 deleted file mode 100644 index dc1249ff88..0000000000 Binary files a/tests/ts/blkid/images-fs/ntfs.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/ntfs.img.xz b/tests/ts/blkid/images-fs/ntfs.img.xz new file mode 100644 index 0000000000..2b414c48f6 Binary files /dev/null and b/tests/ts/blkid/images-fs/ntfs.img.xz differ diff --git a/tests/ts/blkid/images-fs/nvidia-raid.img.bz2 b/tests/ts/blkid/images-fs/nvidia-raid.img.bz2 deleted file mode 100644 index 21f062e103..0000000000 Binary files a/tests/ts/blkid/images-fs/nvidia-raid.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/nvidia-raid.img.xz b/tests/ts/blkid/images-fs/nvidia-raid.img.xz new file mode 100644 index 0000000000..775f810ed0 Binary files /dev/null and b/tests/ts/blkid/images-fs/nvidia-raid.img.xz differ diff --git a/tests/ts/blkid/images-fs/ocfs2.img.bz2 b/tests/ts/blkid/images-fs/ocfs2.img.bz2 deleted file mode 100644 index 7e203dae5d..0000000000 Binary files a/tests/ts/blkid/images-fs/ocfs2.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/ocfs2.img.xz b/tests/ts/blkid/images-fs/ocfs2.img.xz new file mode 100644 index 0000000000..12ed926458 Binary files /dev/null and b/tests/ts/blkid/images-fs/ocfs2.img.xz differ diff --git a/tests/ts/blkid/images-fs/promise-raid.img.bz2 b/tests/ts/blkid/images-fs/promise-raid.img.bz2 deleted file mode 100644 index 64a5a08b8c..0000000000 Binary files a/tests/ts/blkid/images-fs/promise-raid.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/promise-raid.img.xz b/tests/ts/blkid/images-fs/promise-raid.img.xz new file mode 100644 index 0000000000..77f135f4a0 Binary files /dev/null and b/tests/ts/blkid/images-fs/promise-raid.img.xz differ diff --git a/tests/ts/blkid/images-fs/reiser3.img.bz2 b/tests/ts/blkid/images-fs/reiser3.img.bz2 deleted file mode 100644 index 1802bc2136..0000000000 Binary files a/tests/ts/blkid/images-fs/reiser3.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/reiser3.img.xz b/tests/ts/blkid/images-fs/reiser3.img.xz new file mode 100644 index 0000000000..8bc595f2ab Binary files /dev/null and b/tests/ts/blkid/images-fs/reiser3.img.xz differ diff --git a/tests/ts/blkid/images-fs/reiser4.img.bz2 b/tests/ts/blkid/images-fs/reiser4.img.bz2 deleted file mode 100644 index d07571eb45..0000000000 Binary files a/tests/ts/blkid/images-fs/reiser4.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/reiser4.img.xz b/tests/ts/blkid/images-fs/reiser4.img.xz new file mode 100644 index 0000000000..e97f96073a Binary files /dev/null and b/tests/ts/blkid/images-fs/reiser4.img.xz differ diff --git a/tests/ts/blkid/images-fs/romfs.img.bz2 b/tests/ts/blkid/images-fs/romfs.img.bz2 deleted file mode 100644 index f94d77b60b..0000000000 Binary files a/tests/ts/blkid/images-fs/romfs.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/romfs.img.xz b/tests/ts/blkid/images-fs/romfs.img.xz new file mode 100644 index 0000000000..680eeed18d Binary files /dev/null and b/tests/ts/blkid/images-fs/romfs.img.xz differ diff --git a/tests/ts/blkid/images-fs/silicon-raid.img.bz2 b/tests/ts/blkid/images-fs/silicon-raid.img.bz2 deleted file mode 100644 index e3ccbf97ee..0000000000 Binary files a/tests/ts/blkid/images-fs/silicon-raid.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/silicon-raid.img.xz b/tests/ts/blkid/images-fs/silicon-raid.img.xz new file mode 100644 index 0000000000..28d6a425f7 Binary files /dev/null and b/tests/ts/blkid/images-fs/silicon-raid.img.xz differ diff --git a/tests/ts/blkid/images-fs/small-fat32.img.bz2 b/tests/ts/blkid/images-fs/small-fat32.img.bz2 deleted file mode 100644 index 8b90f9c3c7..0000000000 Binary files a/tests/ts/blkid/images-fs/small-fat32.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/small-fat32.img.xz b/tests/ts/blkid/images-fs/small-fat32.img.xz new file mode 100644 index 0000000000..7a04f42b4a Binary files /dev/null and b/tests/ts/blkid/images-fs/small-fat32.img.xz differ diff --git a/tests/ts/blkid/images-fs/swap0.img.bz2 b/tests/ts/blkid/images-fs/swap0.img.bz2 deleted file mode 100644 index d027b6fbf5..0000000000 Binary files a/tests/ts/blkid/images-fs/swap0.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/swap0.img.xz b/tests/ts/blkid/images-fs/swap0.img.xz new file mode 100644 index 0000000000..3cfea73c5d Binary files /dev/null and b/tests/ts/blkid/images-fs/swap0.img.xz differ diff --git a/tests/ts/blkid/images-fs/swap1.img.bz2 b/tests/ts/blkid/images-fs/swap1.img.bz2 deleted file mode 100644 index 37adedd9f8..0000000000 Binary files a/tests/ts/blkid/images-fs/swap1.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/swap1.img.xz b/tests/ts/blkid/images-fs/swap1.img.xz new file mode 100644 index 0000000000..6e6f53951e Binary files /dev/null and b/tests/ts/blkid/images-fs/swap1.img.xz differ diff --git a/tests/ts/blkid/images-fs/tuxonice.img.bz2 b/tests/ts/blkid/images-fs/tuxonice.img.bz2 deleted file mode 100644 index a70c95ad17..0000000000 Binary files a/tests/ts/blkid/images-fs/tuxonice.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/tuxonice.img.xz b/tests/ts/blkid/images-fs/tuxonice.img.xz new file mode 100644 index 0000000000..472cf9cb8d Binary files /dev/null and b/tests/ts/blkid/images-fs/tuxonice.img.xz differ diff --git a/tests/ts/blkid/images-fs/ubifs.img.bz2 b/tests/ts/blkid/images-fs/ubifs.img.bz2 deleted file mode 100644 index efba8f75ef..0000000000 Binary files a/tests/ts/blkid/images-fs/ubifs.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/ubifs.img.xz b/tests/ts/blkid/images-fs/ubifs.img.xz new file mode 100644 index 0000000000..2004f5bdbd Binary files /dev/null and b/tests/ts/blkid/images-fs/ubifs.img.xz differ diff --git a/tests/ts/blkid/images-fs/udf-hdd-mkudffs.img.bz2 b/tests/ts/blkid/images-fs/udf-hdd-mkudffs.img.bz2 deleted file mode 100644 index b088d0fe63..0000000000 Binary files a/tests/ts/blkid/images-fs/udf-hdd-mkudffs.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/udf-hdd-mkudffs.img.xz b/tests/ts/blkid/images-fs/udf-hdd-mkudffs.img.xz new file mode 100644 index 0000000000..39db4be3e2 Binary files /dev/null and b/tests/ts/blkid/images-fs/udf-hdd-mkudffs.img.xz differ diff --git a/tests/ts/blkid/images-fs/udf-hdd-mkudffs2.img.bz2 b/tests/ts/blkid/images-fs/udf-hdd-mkudffs2.img.bz2 deleted file mode 100644 index a3b917829e..0000000000 Binary files a/tests/ts/blkid/images-fs/udf-hdd-mkudffs2.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/udf-hdd-mkudffs2.img.xz b/tests/ts/blkid/images-fs/udf-hdd-mkudffs2.img.xz new file mode 100644 index 0000000000..4cba447bf6 Binary files /dev/null and b/tests/ts/blkid/images-fs/udf-hdd-mkudffs2.img.xz differ diff --git a/tests/ts/blkid/images-fs/udf-hdd-udfclient-0.7.5.img.bz2 b/tests/ts/blkid/images-fs/udf-hdd-udfclient-0.7.5.img.bz2 deleted file mode 100644 index 9b4a84680d..0000000000 Binary files a/tests/ts/blkid/images-fs/udf-hdd-udfclient-0.7.5.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/udf-hdd-udfclient-0.7.5.img.xz b/tests/ts/blkid/images-fs/udf-hdd-udfclient-0.7.5.img.xz new file mode 100644 index 0000000000..baddc84214 Binary files /dev/null and b/tests/ts/blkid/images-fs/udf-hdd-udfclient-0.7.5.img.xz differ diff --git a/tests/ts/blkid/images-fs/udf-hdd-udfclient-0.7.7.img.bz2 b/tests/ts/blkid/images-fs/udf-hdd-udfclient-0.7.7.img.bz2 deleted file mode 100644 index f81be623f7..0000000000 Binary files a/tests/ts/blkid/images-fs/udf-hdd-udfclient-0.7.7.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/udf-hdd-udfclient-0.7.7.img.xz b/tests/ts/blkid/images-fs/udf-hdd-udfclient-0.7.7.img.xz new file mode 100644 index 0000000000..dfb8cdb1a1 Binary files /dev/null and b/tests/ts/blkid/images-fs/udf-hdd-udfclient-0.7.7.img.xz differ diff --git a/tests/ts/blkid/images-fs/udf-hdd-win7.img.bz2 b/tests/ts/blkid/images-fs/udf-hdd-win7.img.bz2 deleted file mode 100644 index d6ce778c56..0000000000 Binary files a/tests/ts/blkid/images-fs/udf-hdd-win7.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/udf-hdd-win7.img.xz b/tests/ts/blkid/images-fs/udf-hdd-win7.img.xz new file mode 100644 index 0000000000..ee8611544c Binary files /dev/null and b/tests/ts/blkid/images-fs/udf-hdd-win7.img.xz differ diff --git a/tests/ts/blkid/images-fs/udf.img.bz2 b/tests/ts/blkid/images-fs/udf.img.bz2 deleted file mode 100644 index bd2deb0af3..0000000000 Binary files a/tests/ts/blkid/images-fs/udf.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/udf.img.xz b/tests/ts/blkid/images-fs/udf.img.xz new file mode 100644 index 0000000000..fdf0edfe21 Binary files /dev/null and b/tests/ts/blkid/images-fs/udf.img.xz differ diff --git a/tests/ts/blkid/images-fs/ufs.img.bz2 b/tests/ts/blkid/images-fs/ufs.img.bz2 deleted file mode 100644 index 67abbeddba..0000000000 Binary files a/tests/ts/blkid/images-fs/ufs.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/ufs.img.xz b/tests/ts/blkid/images-fs/ufs.img.xz new file mode 100644 index 0000000000..58f8b20b99 Binary files /dev/null and b/tests/ts/blkid/images-fs/ufs.img.xz differ diff --git a/tests/ts/blkid/images-fs/via-raid.img.bz2 b/tests/ts/blkid/images-fs/via-raid.img.bz2 deleted file mode 100644 index 9266f5e919..0000000000 Binary files a/tests/ts/blkid/images-fs/via-raid.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/via-raid.img.xz b/tests/ts/blkid/images-fs/via-raid.img.xz new file mode 100644 index 0000000000..c5f6fb7f87 Binary files /dev/null and b/tests/ts/blkid/images-fs/via-raid.img.xz differ diff --git a/tests/ts/blkid/images-fs/vmfs.img.bz2 b/tests/ts/blkid/images-fs/vmfs.img.bz2 deleted file mode 100644 index 09401430f9..0000000000 Binary files a/tests/ts/blkid/images-fs/vmfs.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/vmfs.img.xz b/tests/ts/blkid/images-fs/vmfs.img.xz new file mode 100644 index 0000000000..ce4544e95f Binary files /dev/null and b/tests/ts/blkid/images-fs/vmfs.img.xz differ diff --git a/tests/ts/blkid/images-fs/vmfs_volume.img.bz2 b/tests/ts/blkid/images-fs/vmfs_volume.img.bz2 deleted file mode 100644 index cc0ec66479..0000000000 Binary files a/tests/ts/blkid/images-fs/vmfs_volume.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/vmfs_volume.img.xz b/tests/ts/blkid/images-fs/vmfs_volume.img.xz new file mode 100644 index 0000000000..93f11b4e89 Binary files /dev/null and b/tests/ts/blkid/images-fs/vmfs_volume.img.xz differ diff --git a/tests/ts/blkid/images-fs/xfs-log.img.bz2 b/tests/ts/blkid/images-fs/xfs-log.img.bz2 deleted file mode 100644 index 660846c81f..0000000000 Binary files a/tests/ts/blkid/images-fs/xfs-log.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/xfs-log.img.xz b/tests/ts/blkid/images-fs/xfs-log.img.xz new file mode 100644 index 0000000000..35ff33b1cf Binary files /dev/null and b/tests/ts/blkid/images-fs/xfs-log.img.xz differ diff --git a/tests/ts/blkid/images-fs/xfs.img.bz2 b/tests/ts/blkid/images-fs/xfs.img.bz2 deleted file mode 100644 index cf6982b4a2..0000000000 Binary files a/tests/ts/blkid/images-fs/xfs.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/xfs.img.xz b/tests/ts/blkid/images-fs/xfs.img.xz new file mode 100644 index 0000000000..5576c669bd Binary files /dev/null and b/tests/ts/blkid/images-fs/xfs.img.xz differ diff --git a/tests/ts/blkid/images-fs/zfs.img.bz2 b/tests/ts/blkid/images-fs/zfs.img.bz2 deleted file mode 100644 index dfaaef01ba..0000000000 Binary files a/tests/ts/blkid/images-fs/zfs.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-fs/zfs.img.xz b/tests/ts/blkid/images-fs/zfs.img.xz new file mode 100644 index 0000000000..f85e536db3 Binary files /dev/null and b/tests/ts/blkid/images-fs/zfs.img.xz differ diff --git a/tests/ts/blkid/images-pt/bsd.img.bz2 b/tests/ts/blkid/images-pt/bsd.img.bz2 deleted file mode 100644 index c4b05e4327..0000000000 Binary files a/tests/ts/blkid/images-pt/bsd.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-pt/bsd.img.xz b/tests/ts/blkid/images-pt/bsd.img.xz new file mode 100644 index 0000000000..bfdb50bc7b Binary files /dev/null and b/tests/ts/blkid/images-pt/bsd.img.xz differ diff --git a/tests/ts/blkid/images-pt/dos+bsd.img.bz2 b/tests/ts/blkid/images-pt/dos+bsd.img.bz2 deleted file mode 100644 index cccdd8a9bf..0000000000 Binary files a/tests/ts/blkid/images-pt/dos+bsd.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-pt/dos+bsd.img.xz b/tests/ts/blkid/images-pt/dos+bsd.img.xz new file mode 100644 index 0000000000..f87dd7416a Binary files /dev/null and b/tests/ts/blkid/images-pt/dos+bsd.img.xz differ diff --git a/tests/ts/blkid/images-pt/gpt.img.bz2 b/tests/ts/blkid/images-pt/gpt.img.bz2 deleted file mode 100644 index df4de7c57f..0000000000 Binary files a/tests/ts/blkid/images-pt/gpt.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-pt/gpt.img.xz b/tests/ts/blkid/images-pt/gpt.img.xz new file mode 100644 index 0000000000..9a085b4666 Binary files /dev/null and b/tests/ts/blkid/images-pt/gpt.img.xz differ diff --git a/tests/ts/blkid/images-pt/sgi.img.bz2 b/tests/ts/blkid/images-pt/sgi.img.bz2 deleted file mode 100644 index 3b1c313959..0000000000 Binary files a/tests/ts/blkid/images-pt/sgi.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-pt/sgi.img.xz b/tests/ts/blkid/images-pt/sgi.img.xz new file mode 100644 index 0000000000..d5fed8070a Binary files /dev/null and b/tests/ts/blkid/images-pt/sgi.img.xz differ diff --git a/tests/ts/blkid/images-pt/sun.img.bz2 b/tests/ts/blkid/images-pt/sun.img.bz2 deleted file mode 100644 index adf4f02e87..0000000000 Binary files a/tests/ts/blkid/images-pt/sun.img.bz2 and /dev/null differ diff --git a/tests/ts/blkid/images-pt/sun.img.xz b/tests/ts/blkid/images-pt/sun.img.xz new file mode 100644 index 0000000000..a00594ab63 Binary files /dev/null and b/tests/ts/blkid/images-pt/sun.img.xz differ diff --git a/tests/ts/blkid/low-probe b/tests/ts/blkid/low-probe index eaee089826..628b8a63fd 100755 --- a/tests/ts/blkid/low-probe +++ b/tests/ts/blkid/low-probe @@ -24,16 +24,17 @@ TS_DESC="low-level superblocks probing" ts_init "$*" ts_check_test_command "$TS_CMD_BLKID" +ts_check_prog "xz" mkdir -p $TS_OUTDIR/images-fs -for img in $(ls $TS_SELF/images-fs/*.img.bz2 | sort); do - name=$(basename $img .img.bz2) +for img in $(ls $TS_SELF/images-fs/*.img.xz | sort); do + name=$(basename $img .img.xz) outimg=$TS_OUTDIR/images-fs/${name}.img ts_init_subtest $name - bunzip2 < $img > $outimg + xz -dc $img > $outimg $TS_CMD_BLKID -p -o udev $outimg 2>&1 | sort > $TS_OUTPUT ts_finalize_subtest diff --git a/tests/ts/blkid/lowprobe-pt b/tests/ts/blkid/lowprobe-pt index 4e9927b519..2177de98e1 100755 --- a/tests/ts/blkid/lowprobe-pt +++ b/tests/ts/blkid/lowprobe-pt @@ -24,16 +24,17 @@ TS_DESC="partitions probing" ts_init "$*" ts_check_test_command "$TS_HELPER_PARTITIONS" +ts_check_prog "xz" mkdir -p $TS_OUTDIR/images-pt -for img in $(ls $TS_SELF/images-pt/*.img.bz2 | sort); do - name=$(basename $img .img.bz2) +for img in $(ls $TS_SELF/images-pt/*.img.xz | sort); do + name=$(basename $img .img.xz) outimg=$TS_OUTDIR/images-pt/${name}.img ts_init_subtest $name - bunzip2 < $img > $outimg + xz -dc $img > $outimg $TS_HELPER_PARTITIONS $outimg &> $TS_OUTPUT ts_finalize_subtest diff --git a/tests/ts/partx/partx b/tests/ts/partx/partx index ed6d0e1843..91bab4f187 100755 --- a/tests/ts/partx/partx +++ b/tests/ts/partx/partx @@ -22,6 +22,7 @@ TS_IMGDIR="$TS_TOPDIR/ts/blkid/images-pt" PARTS=3 . $TS_TOPDIR/functions.sh +ts_check_prog "xz" ts_init "$*" @@ -32,13 +33,13 @@ ts_check_test_command "$TS_CMD_DELPART" ts_skip_nonroot mkdir -p $TS_OUTDIR/images-pt -for img in $(ls $TS_IMGDIR/*.img.bz2 | sort); do - name=$(basename $img .img.bz2) +for img in $(ls $TS_IMGDIR/*.img.xz | sort); do + name=$(basename $img .img.xz) outimg=$TS_OUTDIR/images-pt/${name}.img ts_init_subtest $name - bunzip2 < $img > $outimg + xz -dc $img > $outimg $TS_CMD_PARTX $outimg &> $TS_OUTPUT ts_finalize_subtest