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 <ruediger.meier@ga-group.nl>

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 (file)
index d3c10d7..0000000
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 (file)
index 0000000..20387cd
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 (file)
index 71fe1ee..0000000
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 (file)
index 0000000..ed187f1
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 (file)
index 97afedb..0000000
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 (file)
index 0000000..af90cbf
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 (file)
index f4deaec..0000000
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 (file)
index 0000000..188a6e8
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 (file)
index 54df48f..0000000
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 (file)
index 0000000..98f024a
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 (file)
index d638116..0000000
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 (file)
index 0000000..5943867
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 (file)
index b093493..0000000
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 (file)
index 0000000..b5b64fe
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 (file)
index 6979055..0000000
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 (file)
index 0000000..d31bfc1
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 (file)
index f96c3f0..0000000
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 (file)
index 0000000..43cc09a
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 (file)
index d1811ce..0000000
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 (file)
index 0000000..3b5489f
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 (file)
index 5394598..0000000
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 (file)
index 0000000..7d170e2
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 (file)
index 82e8601..0000000
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 (file)
index 0000000..f7f9dde
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 (file)
index 1fa7f2d..0000000
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 (file)
index 0000000..4e0997a
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 (file)
index 4d3d26c..0000000
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 (file)
index 0000000..a0ee296
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 (file)
index ca76293..0000000
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 (file)
index 0000000..f0976bc
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 (file)
index bab2f90..0000000
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 (file)
index 0000000..22d4d6b
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 (file)
index d4fc1ab..0000000
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 (file)
index 0000000..cfa3252
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 (file)
index b6ad1b9..0000000
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 (file)
index 0000000..1c37a70
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 (file)
index a54e6df..0000000
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 (file)
index 0000000..4e22a8e
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 (file)
index 52e13bb..0000000
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 (file)
index 0000000..1b53059
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 (file)
index 1feaa5b..0000000
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 (file)
index 0000000..7dfe68a
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 (file)
index 4e43c0b..0000000
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 (file)
index 0000000..16b8961
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 (file)
index 97e8b76..0000000
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 (file)
index 0000000..1d6ad2c
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 (file)
index 4389847..0000000
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 (file)
index 0000000..f1146f3
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 (file)
index 9214c96..0000000
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 (file)
index 0000000..8e5529a
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 (file)
index e6c4fc4..0000000
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 (file)
index 0000000..7c5a089
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 (file)
index 1d4d249..0000000
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 (file)
index 0000000..4780f6d
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 (file)
index 3b4b236..0000000
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 (file)
index 0000000..cde0811
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 (file)
index ffd75c3..0000000
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 (file)
index 0000000..d6ae15a
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 (file)
index 7bb84bf..0000000
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 (file)
index 0000000..4c3c183
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 (file)
index d5a67a3..0000000
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 (file)
index 0000000..e8ff4f5
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 (file)
index 0730283..0000000
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 (file)
index 0000000..c349a4f
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 (file)
index c6674c9..0000000
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 (file)
index 0000000..da646a8
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 (file)
index 9c20673..0000000
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 (file)
index 0000000..fe5b103
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 (file)
index a9762eb..0000000
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 (file)
index 0000000..38de645
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 (file)
index dc1249f..0000000
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 (file)
index 0000000..2b414c4
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 (file)
index 21f062e..0000000
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 (file)
index 0000000..775f810
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 (file)
index 7e203da..0000000
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 (file)
index 0000000..12ed926
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 (file)
index 64a5a08..0000000
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 (file)
index 0000000..77f135f
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 (file)
index 1802bc2..0000000
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 (file)
index 0000000..8bc595f
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 (file)
index d07571e..0000000
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 (file)
index 0000000..e97f960
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 (file)
index f94d77b..0000000
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 (file)
index 0000000..680eeed
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 (file)
index e3ccbf9..0000000
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 (file)
index 0000000..28d6a42
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 (file)
index 8b90f9c..0000000
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 (file)
index 0000000..7a04f42
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 (file)
index d027b6f..0000000
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 (file)
index 0000000..3cfea73
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 (file)
index 37adedd..0000000
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 (file)
index 0000000..6e6f539
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 (file)
index a70c95a..0000000
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 (file)
index 0000000..472cf9c
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 (file)
index efba8f7..0000000
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 (file)
index 0000000..2004f5b
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 (file)
index b088d0f..0000000
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 (file)
index 0000000..39db4be
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 (file)
index a3b9178..0000000
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 (file)
index 0000000..4cba447
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 (file)
index 9b4a846..0000000
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 (file)
index 0000000..baddc84
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 (file)
index f81be62..0000000
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 (file)
index 0000000..dfb8cdb
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 (file)
index d6ce778..0000000
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 (file)
index 0000000..ee86115
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 (file)
index bd2deb0..0000000
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 (file)
index 0000000..fdf0edf
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 (file)
index 67abbed..0000000
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 (file)
index 0000000..58f8b20
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 (file)
index 9266f5e..0000000
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 (file)
index 0000000..c5f6fb7
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 (file)
index 0940143..0000000
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 (file)
index 0000000..ce4544e
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 (file)
index cc0ec66..0000000
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 (file)
index 0000000..93f11b4
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 (file)
index 660846c..0000000
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 (file)
index 0000000..35ff33b
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 (file)
index cf6982b..0000000
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 (file)
index 0000000..5576c66
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 (file)
index dfaaef0..0000000
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 (file)
index 0000000..f85e536
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 (file)
index c4b05e4..0000000
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 (file)
index 0000000..bfdb50b
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 (file)
index cccdd8a..0000000
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 (file)
index 0000000..f87dd74
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 (file)
index df4de7c..0000000
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 (file)
index 0000000..9a085b4
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 (file)
index 3b1c313..0000000
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 (file)
index 0000000..d5fed80
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 (file)
index adf4f02..0000000
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 (file)
index 0000000..a00594a
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 eaee0898265199dec035594ba5eb25c64315d5c6..628b8a63fd118cd5d83bb3f210e16fda62b94563 100755 (executable)
--- 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 4e9927b519ac9ce879c414a672aff128938bd09c..2177de98e1a3a247357970205d1f34a660ffe179 100755 (executable)
--- 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 ed6d0e1843a3642dfe43ccbc7670954a4f275d9b..91bab4f1876cef872bec1f05e5a043af2bd62dd3 100755 (executable)
--- 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