From e2142701ac6f86815dc85688efcbe1a221bef22e Mon Sep 17 00:00:00 2001
From: Ruediger Meier
Date: Wed, 2 Dec 2015 15:24:27 +0100
Subject: tests: avoid sed -E

GNU sed's -E option for BSD compatibility is relatively new (>=4.2) and
undocumented.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
 tests/ts/uuid/uuidd    | 2 +-
 tests/ts/wipefs/wipefs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/ts/uuid/uuidd b/tests/ts/uuid/uuidd
index 147f289a4..17cf29d06 100755
--- a/tests/ts/uuid/uuidd
+++ b/tests/ts/uuid/uuidd
@@ -33,7 +33,7 @@ fi
 test_flag() {
 	echo "options: $*" >> $TS_OUTPUT
 	$TS_CMD_UUIDD -s $UUIDD_SOCKET $* |
-		sed -E '/List of UUIDs:/d; s/^[[:space:]]+//' > "$OUTPUT_FILE" 2>>$TS_OUTPUT
+		sed '/List of UUIDs:/d; s/^[[:space:]]*//' > "$OUTPUT_FILE" 2>>$TS_OUTPUT
 	$TS_HELPER_UUID_PARSER "$OUTPUT_FILE" >> $TS_OUTPUT 2>&1
 	ret=$?
 	if [ $ret -ne 0 ]; then
diff --git a/tests/ts/wipefs/wipefs b/tests/ts/wipefs/wipefs
index f921625c5..d47267827 100755
--- a/tests/ts/wipefs/wipefs
+++ b/tests/ts/wipefs/wipefs
@@ -20,7 +20,7 @@ $TS_CMD_WIPEFS --all --backup ${TS_DEVICE} &>/dev/null || ts_die "wipefs failed"
 
 #there should be just one magic string/backup file in this case
 INFILE=$(ls $HOME/wipefs-$(basename ${TS_DEVICE})-*.bak)
-OFFT=$(echo $INFILE | sed -E 's/^.*-(.*).bak$/\1/')
+OFFT=$(echo $INFILE | sed 's/^.*-\(.*\).bak$/\1/')
 dd if=$INFILE of=$TS_DEVICE bs=1 conv=notrunc seek=$(($OFFT)) &>/dev/null
 
 #the bytes should be copied back, check if wipefs can recognize it
-- 
cgit v1.2.3-55-g7522


From caad4ded121790c89f0c383636c6cf7e9b4a04d4 Mon Sep 17 00:00:00 2001
From: Ruediger Meier
Date: Thu, 3 Dec 2015 01:42:28 +0100
Subject: tests: add some line tests

regarding e03f29b6 ...

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
 tests/expected/misc/line |  6 ++++++
 tests/ts/misc/line       | 11 +++++++++++
 2 files changed, 17 insertions(+)

diff --git a/tests/expected/misc/line b/tests/expected/misc/line
index 789819226..fa7dcebb0 100644
--- a/tests/expected/misc/line
+++ b/tests/expected/misc/line
@@ -1 +1,7 @@
 a
+ret: 0
+1
+2
+ret: 0
+
+ret: 1
diff --git a/tests/ts/misc/line b/tests/ts/misc/line
index a17ee28cc..71d5c0424 100755
--- a/tests/ts/misc/line
+++ b/tests/ts/misc/line
@@ -20,7 +20,18 @@ ts_init "$*"
 
 ts_check_test_command "$TS_CMD_LINE"
 
+# usually behave like "head -n 1"
 printf "a\nb\n" |
 	$TS_CMD_LINE > $TS_OUTPUT 2>&1
+echo "ret: $?" >> $TS_OUTPUT
+
+# never consume more than one line
+printf "1\n2\n" |
+	($TS_CMD_LINE && $TS_CMD_LINE) >> $TS_OUTPUT 2>&1
+echo "ret: $?" >> $TS_OUTPUT
+
+# always print one newline, return 1 on EOF
+$TS_CMD_LINE </dev/null >> $TS_OUTPUT 2>&1
+echo "ret: $?" >> $TS_OUTPUT
 
 ts_finalize
-- 
cgit v1.2.3-55-g7522


From 84918ad0fcc03d065dbe238459cc31b26225420f Mon Sep 17 00:00:00 2001
From: Ruediger Meier
Date: Mon, 7 Dec 2015 17:48:56 +0100
Subject: 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>
---
 tests/ts/blkid/images-fs/adaptec-raid.img.bz2           | Bin 256 -> 0 bytes
 tests/ts/blkid/images-fs/adaptec-raid.img.xz            | Bin 0 -> 672 bytes
 tests/ts/blkid/images-fs/bcache-B.img.bz2               | Bin 161 -> 0 bytes
 tests/ts/blkid/images-fs/bcache-B.img.xz                | Bin 0 -> 180 bytes
 tests/ts/blkid/images-fs/bcache-C.img.bz2               | Bin 201 -> 0 bytes
 tests/ts/blkid/images-fs/bcache-C.img.xz                | Bin 0 -> 9976 bytes
 tests/ts/blkid/images-fs/befs.img.bz2                   | Bin 36236 -> 0 bytes
 tests/ts/blkid/images-fs/befs.img.xz                    | Bin 0 -> 28584 bytes
 tests/ts/blkid/images-fs/bfs.img.bz2                    | Bin 133 -> 0 bytes
 tests/ts/blkid/images-fs/bfs.img.xz                     | Bin 0 -> 492 bytes
 tests/ts/blkid/images-fs/cramfs.img.bz2                 | Bin 124 -> 0 bytes
 tests/ts/blkid/images-fs/cramfs.img.xz                  | Bin 0 -> 144 bytes
 tests/ts/blkid/images-fs/ddf-raid.img.bz2               | Bin 599 -> 0 bytes
 tests/ts/blkid/images-fs/ddf-raid.img.xz                | Bin 0 -> 8140 bytes
 .../blkid/images-fs/drbdmanage-control-volume.img.bz2   | Bin 2001 -> 0 bytes
 .../ts/blkid/images-fs/drbdmanage-control-volume.img.xz | Bin 0 -> 2520 bytes
 tests/ts/blkid/images-fs/exfat.img.bz2                  | Bin 6301 -> 0 bytes
 tests/ts/blkid/images-fs/exfat.img.xz                   | Bin 0 -> 4620 bytes
 tests/ts/blkid/images-fs/ext2.img.bz2                   | Bin 356 -> 0 bytes
 tests/ts/blkid/images-fs/ext2.img.xz                    | Bin 0 -> 384 bytes
 tests/ts/blkid/images-fs/ext3.img.bz2                   | Bin 1489 -> 0 bytes
 tests/ts/blkid/images-fs/ext3.img.xz                    | Bin 0 -> 1612 bytes
 tests/ts/blkid/images-fs/f2fs.img.bz2                   | Bin 695 -> 0 bytes
 tests/ts/blkid/images-fs/f2fs.img.xz                    | Bin 0 -> 22188 bytes
 tests/ts/blkid/images-fs/fat.img.bz2                    | Bin 249 -> 0 bytes
 tests/ts/blkid/images-fs/fat.img.xz                     | Bin 0 -> 488 bytes
 tests/ts/blkid/images-fs/fat16_noheads.img.bz2          | Bin 336 -> 0 bytes
 tests/ts/blkid/images-fs/fat16_noheads.img.xz           | Bin 0 -> 16300 bytes
 tests/ts/blkid/images-fs/fat32_label_64MB.img.bz2       | Bin 1151 -> 0 bytes
 tests/ts/blkid/images-fs/fat32_label_64MB.img.xz        | Bin 0 -> 10428 bytes
 tests/ts/blkid/images-fs/gfs2.img.bz2                   | Bin 130 -> 0 bytes
 tests/ts/blkid/images-fs/gfs2.img.xz                    | Bin 0 -> 5092 bytes
 tests/ts/blkid/images-fs/hfs.img.bz2                    | Bin 257 -> 0 bytes
 tests/ts/blkid/images-fs/hfs.img.xz                     | Bin 0 -> 1876 bytes
 tests/ts/blkid/images-fs/hfsplus.img.bz2                | Bin 300 -> 0 bytes
 tests/ts/blkid/images-fs/hfsplus.img.xz                 | Bin 0 -> 1940 bytes
 tests/ts/blkid/images-fs/hpfs.img.bz2                   | Bin 2454 -> 0 bytes
 tests/ts/blkid/images-fs/hpfs.img.xz                    | Bin 0 -> 2172 bytes
 tests/ts/blkid/images-fs/hpt37x-raid.img.bz2            | Bin 123 -> 0 bytes
 tests/ts/blkid/images-fs/hpt37x-raid.img.xz             | Bin 0 -> 400 bytes
 tests/ts/blkid/images-fs/hpt45x-raid.img.bz2            | Bin 151 -> 0 bytes
 tests/ts/blkid/images-fs/hpt45x-raid.img.xz             | Bin 0 -> 424 bytes
 tests/ts/blkid/images-fs/iso-joliet.img.bz2             | Bin 21050 -> 0 bytes
 tests/ts/blkid/images-fs/iso-joliet.img.xz              | Bin 0 -> 21884 bytes
 tests/ts/blkid/images-fs/iso-rr-joliet.img.bz2          | Bin 21380 -> 0 bytes
 tests/ts/blkid/images-fs/iso-rr-joliet.img.xz           | Bin 0 -> 22144 bytes
 tests/ts/blkid/images-fs/iso.img.bz2                    | Bin 20718 -> 0 bytes
 tests/ts/blkid/images-fs/iso.img.xz                     | Bin 0 -> 21656 bytes
 tests/ts/blkid/images-fs/isw-raid.img.bz2               | Bin 251 -> 0 bytes
 tests/ts/blkid/images-fs/isw-raid.img.xz                | Bin 0 -> 528 bytes
 tests/ts/blkid/images-fs/jbd.img.bz2                    | Bin 214 -> 0 bytes
 tests/ts/blkid/images-fs/jbd.img.xz                     | Bin 0 -> 688 bytes
 tests/ts/blkid/images-fs/jfs.img.bz2                    | Bin 3434 -> 0 bytes
 tests/ts/blkid/images-fs/jfs.img.xz                     | Bin 0 -> 4768 bytes
 tests/ts/blkid/images-fs/jmicron-raid.img.bz2           | Bin 159 -> 0 bytes
 tests/ts/blkid/images-fs/jmicron-raid.img.xz            | Bin 0 -> 480 bytes
 tests/ts/blkid/images-fs/lsi-raid.img.bz2               | Bin 146 -> 0 bytes
 tests/ts/blkid/images-fs/lsi-raid.img.xz                | Bin 0 -> 436 bytes
 tests/ts/blkid/images-fs/lvm2.img.bz2                   | Bin 177 -> 0 bytes
 tests/ts/blkid/images-fs/lvm2.img.xz                    | Bin 0 -> 512 bytes
 tests/ts/blkid/images-fs/mdraid.img.bz2                 | Bin 160 -> 0 bytes
 tests/ts/blkid/images-fs/mdraid.img.xz                  | Bin 0 -> 1752 bytes
 tests/ts/blkid/images-fs/minix-BE.img.bz2               | Bin 144 -> 0 bytes
 tests/ts/blkid/images-fs/minix-BE.img.xz                | Bin 0 -> 220 bytes
 tests/ts/blkid/images-fs/minix-LE.img.bz2               | Bin 140 -> 0 bytes
 tests/ts/blkid/images-fs/minix-LE.img.xz                | Bin 0 -> 224 bytes
 tests/ts/blkid/images-fs/netware.img.bz2                | Bin 239 -> 0 bytes
 tests/ts/blkid/images-fs/netware.img.xz                 | Bin 0 -> 244 bytes
 tests/ts/blkid/images-fs/nilfs2.img.bz2                 | Bin 795 -> 0 bytes
 tests/ts/blkid/images-fs/nilfs2.img.xz                  | Bin 0 -> 25072 bytes
 tests/ts/blkid/images-fs/ntfs.img.bz2                   | Bin 35942 -> 0 bytes
 tests/ts/blkid/images-fs/ntfs.img.xz                    | Bin 0 -> 89576 bytes
 tests/ts/blkid/images-fs/nvidia-raid.img.bz2            | Bin 175 -> 0 bytes
 tests/ts/blkid/images-fs/nvidia-raid.img.xz             | Bin 0 -> 572 bytes
 tests/ts/blkid/images-fs/ocfs2.img.bz2                  | Bin 1070 -> 0 bytes
 tests/ts/blkid/images-fs/ocfs2.img.xz                   | Bin 0 -> 18644 bytes
 tests/ts/blkid/images-fs/promise-raid.img.bz2           | Bin 784 -> 0 bytes
 tests/ts/blkid/images-fs/promise-raid.img.xz            | Bin 0 -> 740 bytes
 tests/ts/blkid/images-fs/reiser3.img.bz2                | Bin 282 -> 0 bytes
 tests/ts/blkid/images-fs/reiser3.img.xz                 | Bin 0 -> 936 bytes
 tests/ts/blkid/images-fs/reiser4.img.bz2                | Bin 372 -> 0 bytes
 tests/ts/blkid/images-fs/reiser4.img.xz                 | Bin 0 -> 904 bytes
 tests/ts/blkid/images-fs/romfs.img.bz2                  | Bin 115 -> 0 bytes
 tests/ts/blkid/images-fs/romfs.img.xz                   | Bin 0 -> 384 bytes
 tests/ts/blkid/images-fs/silicon-raid.img.bz2           | Bin 328 -> 0 bytes
 tests/ts/blkid/images-fs/silicon-raid.img.xz            | Bin 0 -> 588 bytes
 tests/ts/blkid/images-fs/small-fat32.img.bz2            | Bin 372 -> 0 bytes
 tests/ts/blkid/images-fs/small-fat32.img.xz             | Bin 0 -> 576 bytes
 tests/ts/blkid/images-fs/swap0.img.bz2                  | Bin 75 -> 0 bytes
 tests/ts/blkid/images-fs/swap0.img.xz                   | Bin 0 -> 496 bytes
 tests/ts/blkid/images-fs/swap1.img.bz2                  | Bin 121 -> 0 bytes
 tests/ts/blkid/images-fs/swap1.img.xz                   | Bin 0 -> 524 bytes
 tests/ts/blkid/images-fs/tuxonice.img.bz2               | Bin 36891 -> 0 bytes
 tests/ts/blkid/images-fs/tuxonice.img.xz                | Bin 0 -> 37032 bytes
 tests/ts/blkid/images-fs/ubifs.img.bz2                  | Bin 937 -> 0 bytes
 tests/ts/blkid/images-fs/ubifs.img.xz                   | Bin 0 -> 1128 bytes
 tests/ts/blkid/images-fs/udf-hdd-mkudffs.img.bz2        | Bin 1042 -> 0 bytes
 tests/ts/blkid/images-fs/udf-hdd-mkudffs.img.xz         | Bin 0 -> 2728 bytes
 tests/ts/blkid/images-fs/udf-hdd-mkudffs2.img.bz2       | Bin 1082 -> 0 bytes
 tests/ts/blkid/images-fs/udf-hdd-mkudffs2.img.xz        | Bin 0 -> 2772 bytes
 .../ts/blkid/images-fs/udf-hdd-udfclient-0.7.5.img.bz2  | Bin 816 -> 0 bytes
 tests/ts/blkid/images-fs/udf-hdd-udfclient-0.7.5.img.xz | Bin 0 -> 2292 bytes
 .../ts/blkid/images-fs/udf-hdd-udfclient-0.7.7.img.bz2  | Bin 822 -> 0 bytes
 tests/ts/blkid/images-fs/udf-hdd-udfclient-0.7.7.img.xz | Bin 0 -> 2296 bytes
 tests/ts/blkid/images-fs/udf-hdd-win7.img.bz2           | Bin 884 -> 0 bytes
 tests/ts/blkid/images-fs/udf-hdd-win7.img.xz            | Bin 0 -> 2624 bytes
 tests/ts/blkid/images-fs/udf.img.bz2                    | Bin 2031 -> 0 bytes
 tests/ts/blkid/images-fs/udf.img.xz                     | Bin 0 -> 1884 bytes
 tests/ts/blkid/images-fs/ufs.img.bz2                    | Bin 1318 -> 0 bytes
 tests/ts/blkid/images-fs/ufs.img.xz                     | Bin 0 -> 1296 bytes
 tests/ts/blkid/images-fs/via-raid.img.bz2               | Bin 99 -> 0 bytes
 tests/ts/blkid/images-fs/via-raid.img.xz                | Bin 0 -> 528 bytes
 tests/ts/blkid/images-fs/vmfs.img.bz2                   | Bin 144 -> 0 bytes
 tests/ts/blkid/images-fs/vmfs.img.xz                    | Bin 0 -> 512 bytes
 tests/ts/blkid/images-fs/vmfs_volume.img.bz2            | Bin 287 -> 0 bytes
 tests/ts/blkid/images-fs/vmfs_volume.img.xz             | Bin 0 -> 680 bytes
 tests/ts/blkid/images-fs/xfs-log.img.bz2                | Bin 138 -> 0 bytes
 tests/ts/blkid/images-fs/xfs-log.img.xz                 | Bin 0 -> 1720 bytes
 tests/ts/blkid/images-fs/xfs.img.bz2                    | Bin 443 -> 0 bytes
 tests/ts/blkid/images-fs/xfs.img.xz                     | Bin 0 -> 2892 bytes
 tests/ts/blkid/images-fs/zfs.img.bz2                    | Bin 10912 -> 0 bytes
 tests/ts/blkid/images-fs/zfs.img.xz                     | Bin 0 -> 19904 bytes
 tests/ts/blkid/images-pt/bsd.img.bz2                    | Bin 122 -> 0 bytes
 tests/ts/blkid/images-pt/bsd.img.xz                     | Bin 0 -> 840 bytes
 tests/ts/blkid/images-pt/dos+bsd.img.bz2                | Bin 1728 -> 0 bytes
 tests/ts/blkid/images-pt/dos+bsd.img.xz                 | Bin 0 -> 2620 bytes
 tests/ts/blkid/images-pt/gpt.img.bz2                    | Bin 494 -> 0 bytes
 tests/ts/blkid/images-pt/gpt.img.xz                     | Bin 0 -> 2140 bytes
 tests/ts/blkid/images-pt/sgi.img.bz2                    | Bin 144 -> 0 bytes
 tests/ts/blkid/images-pt/sgi.img.xz                     | Bin 0 -> 1724 bytes
 tests/ts/blkid/images-pt/sun.img.bz2                    | Bin 170 -> 0 bytes
 tests/ts/blkid/images-pt/sun.img.xz                     | Bin 0 -> 1748 bytes
 tests/ts/blkid/low-probe                                |   7 ++++---
 tests/ts/blkid/lowprobe-pt                              |   7 ++++---
 tests/ts/partx/partx                                    |   7 ++++---
 135 files changed, 12 insertions(+), 9 deletions(-)
 delete mode 100644 tests/ts/blkid/images-fs/adaptec-raid.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/adaptec-raid.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/bcache-B.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/bcache-B.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/bcache-C.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/bcache-C.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/befs.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/befs.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/bfs.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/bfs.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/cramfs.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/cramfs.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/ddf-raid.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/ddf-raid.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/drbdmanage-control-volume.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/drbdmanage-control-volume.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/exfat.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/exfat.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/ext2.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/ext2.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/ext3.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/ext3.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/f2fs.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/f2fs.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/fat.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/fat.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/fat16_noheads.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/fat16_noheads.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/fat32_label_64MB.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/fat32_label_64MB.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/gfs2.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/gfs2.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/hfs.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/hfs.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/hfsplus.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/hfsplus.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/hpfs.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/hpfs.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/hpt37x-raid.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/hpt37x-raid.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/hpt45x-raid.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/hpt45x-raid.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/iso-joliet.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/iso-joliet.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/iso-rr-joliet.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/iso-rr-joliet.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/iso.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/iso.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/isw-raid.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/isw-raid.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/jbd.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/jbd.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/jfs.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/jfs.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/jmicron-raid.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/jmicron-raid.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/lsi-raid.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/lsi-raid.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/lvm2.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/lvm2.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/mdraid.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/mdraid.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/minix-BE.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/minix-BE.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/minix-LE.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/minix-LE.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/netware.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/netware.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/nilfs2.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/nilfs2.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/ntfs.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/ntfs.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/nvidia-raid.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/nvidia-raid.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/ocfs2.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/ocfs2.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/promise-raid.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/promise-raid.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/reiser3.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/reiser3.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/reiser4.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/reiser4.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/romfs.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/romfs.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/silicon-raid.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/silicon-raid.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/small-fat32.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/small-fat32.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/swap0.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/swap0.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/swap1.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/swap1.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/tuxonice.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/tuxonice.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/ubifs.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/ubifs.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/udf-hdd-mkudffs.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/udf-hdd-mkudffs.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/udf-hdd-mkudffs2.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/udf-hdd-mkudffs2.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/udf-hdd-udfclient-0.7.5.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/udf-hdd-udfclient-0.7.5.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/udf-hdd-udfclient-0.7.7.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/udf-hdd-udfclient-0.7.7.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/udf-hdd-win7.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/udf-hdd-win7.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/udf.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/udf.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/ufs.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/ufs.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/via-raid.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/via-raid.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/vmfs.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/vmfs.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/vmfs_volume.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/vmfs_volume.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/xfs-log.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/xfs-log.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/xfs.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/xfs.img.xz
 delete mode 100644 tests/ts/blkid/images-fs/zfs.img.bz2
 create mode 100644 tests/ts/blkid/images-fs/zfs.img.xz
 delete mode 100644 tests/ts/blkid/images-pt/bsd.img.bz2
 create mode 100644 tests/ts/blkid/images-pt/bsd.img.xz
 delete mode 100644 tests/ts/blkid/images-pt/dos+bsd.img.bz2
 create mode 100644 tests/ts/blkid/images-pt/dos+bsd.img.xz
 delete mode 100644 tests/ts/blkid/images-pt/gpt.img.bz2
 create mode 100644 tests/ts/blkid/images-pt/gpt.img.xz
 delete mode 100644 tests/ts/blkid/images-pt/sgi.img.bz2
 create mode 100644 tests/ts/blkid/images-pt/sgi.img.xz
 delete mode 100644 tests/ts/blkid/images-pt/sun.img.bz2
 create mode 100644 tests/ts/blkid/images-pt/sun.img.xz

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 d3c10d793..000000000
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 000000000..20387cdde
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 71fe1eeb7..000000000
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 000000000..ed187f113
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 97afedbae..000000000
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 000000000..af90cbfd3
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 f4deaec4c..000000000
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 000000000..188a6e8e8
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 54df48f77..000000000
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 000000000..98f024ab4
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 d6381168f..000000000
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 000000000..594386799
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 b09349337..000000000
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 000000000..b5b64fe47
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 697905544..000000000
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 000000000..d31bfc175
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 f96c3f06e..000000000
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 000000000..43cc09a7c
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 d1811ce3d..000000000
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 000000000..3b5489f1a
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 539459869..000000000
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 000000000..7d170e2c2
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 82e86013d..000000000
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 000000000..f7f9dde99
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 1fa7f2d9f..000000000
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 000000000..4e0997a5a
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 4d3d26c8c..000000000
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 000000000..a0ee29640
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 ca7629380..000000000
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 000000000..f0976bc91
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 bab2f901d..000000000
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 000000000..22d4d6bc3
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 d4fc1ab45..000000000
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 000000000..cfa3252cd
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 b6ad1b976..000000000
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 000000000..1c37a70b1
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 a54e6dfcd..000000000
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 000000000..4e22a8e54
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 52e13bb30..000000000
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 000000000..1b53059fb
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 1feaa5bea..000000000
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 000000000..7dfe68acd
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 4e43c0b8b..000000000
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 000000000..16b896130
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 97e8b7692..000000000
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 000000000..1d6ad2c4b
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 43898475e..000000000
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 000000000..f1146f3a0
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 9214c96f1..000000000
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 000000000..8e5529ac0
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 e6c4fc439..000000000
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 000000000..7c5a089bb
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 1d4d249eb..000000000
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 000000000..4780f6d0a
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 3b4b23670..000000000
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 000000000..cde0811c6
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 ffd75c3a2..000000000
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 000000000..d6ae15aac
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 7bb84bf4d..000000000
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 000000000..4c3c183fb
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 d5a67a34d..000000000
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 000000000..e8ff4f55c
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 073028316..000000000
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 000000000..c349a4f85
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 c6674c951..000000000
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 000000000..da646a8b4
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 9c2067304..000000000
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 000000000..fe5b1030e
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 a9762eb1a..000000000
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 000000000..38de64561
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 dc1249ff8..000000000
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 000000000..2b414c48f
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 21f062e10..000000000
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 000000000..775f810ed
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 7e203dae5..000000000
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 000000000..12ed92645
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 64a5a08b8..000000000
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 000000000..77f135f4a
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 1802bc213..000000000
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 000000000..8bc595f2a
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 d07571eb4..000000000
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 000000000..e97f96073
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 f94d77b60..000000000
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 000000000..680eeed18
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 e3ccbf97e..000000000
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 000000000..28d6a425f
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 8b90f9c3c..000000000
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 000000000..7a04f42b4
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 d027b6fbf..000000000
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 000000000..3cfea73c5
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 37adedd9f..000000000
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 000000000..6e6f53951
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 a70c95ad1..000000000
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 000000000..472cf9cb8
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 efba8f75e..000000000
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 000000000..2004f5bdb
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 b088d0fe6..000000000
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 000000000..39db4be3e
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 a3b917829..000000000
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 000000000..4cba447bf
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 9b4a84680..000000000
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 000000000..baddc8421
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 f81be623f..000000000
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 000000000..dfb8cdb1a
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 d6ce778c5..000000000
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 000000000..ee8611544
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 bd2deb0af..000000000
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 000000000..fdf0edfe2
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 67abbeddb..000000000
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 000000000..58f8b20b9
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 9266f5e91..000000000
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 000000000..c5f6fb7f8
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 09401430f..000000000
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 000000000..ce4544e95
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 cc0ec6647..000000000
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 000000000..93f11b4e8
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 660846c81..000000000
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 000000000..35ff33b1c
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 cf6982b4a..000000000
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 000000000..5576c669b
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 dfaaef01b..000000000
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 000000000..f85e536db
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 c4b05e432..000000000
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 000000000..bfdb50bc7
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 cccdd8a9b..000000000
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 000000000..f87dd7416
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 df4de7c57..000000000
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 000000000..9a085b466
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 3b1c31395..000000000
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 000000000..d5fed8070
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 adf4f02e8..000000000
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 000000000..a00594ab6
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 eaee08982..628b8a63f 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 4e9927b51..2177de98e 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 ed6d0e184..91bab4f18 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
-- 
cgit v1.2.3-55-g7522