diff options
author | Karel Zak | 2015-12-10 11:18:04 +0100 |
---|---|---|
committer | Karel Zak | 2015-12-10 11:18:04 +0100 |
commit | 96c6ccd55412a93793988e8d9495f9684c33c2ff (patch) | |
tree | 14a7a09334d971679be548f3acd39a6457461054 | |
parent | tests: skip BLKDISCARD if unsupported (diff) | |
parent | tests: use xz instead of bzip2 for blkid images (diff) | |
download | kernel-qcow2-util-linux-96c6ccd55412a93793988e8d9495f9684c33c2ff.tar.gz kernel-qcow2-util-linux-96c6ccd55412a93793988e8d9495f9684c33c2ff.tar.xz kernel-qcow2-util-linux-96c6ccd55412a93793988e8d9495f9684c33c2ff.zip |
Merge branch 'test-fixes' of https://github.com/rudimeier/util-linux
* 'test-fixes' of https://github.com/rudimeier/util-linux:
tests: use xz instead of bzip2 for blkid images
tests: add some line tests
tests: avoid sed -E
139 files changed, 31 insertions, 11 deletions
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/blkid/images-fs/adaptec-raid.img.bz2 b/tests/ts/blkid/images-fs/adaptec-raid.img.bz2 Binary files differdeleted file mode 100644 index d3c10d793..000000000 --- a/tests/ts/blkid/images-fs/adaptec-raid.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/adaptec-raid.img.xz b/tests/ts/blkid/images-fs/adaptec-raid.img.xz Binary files differnew file mode 100644 index 000000000..20387cdde --- /dev/null +++ b/tests/ts/blkid/images-fs/adaptec-raid.img.xz diff --git a/tests/ts/blkid/images-fs/bcache-B.img.bz2 b/tests/ts/blkid/images-fs/bcache-B.img.bz2 Binary files differdeleted file mode 100644 index 71fe1eeb7..000000000 --- a/tests/ts/blkid/images-fs/bcache-B.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/bcache-B.img.xz b/tests/ts/blkid/images-fs/bcache-B.img.xz Binary files differnew file mode 100644 index 000000000..ed187f113 --- /dev/null +++ b/tests/ts/blkid/images-fs/bcache-B.img.xz diff --git a/tests/ts/blkid/images-fs/bcache-C.img.bz2 b/tests/ts/blkid/images-fs/bcache-C.img.bz2 Binary files differdeleted file mode 100644 index 97afedbae..000000000 --- a/tests/ts/blkid/images-fs/bcache-C.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/bcache-C.img.xz b/tests/ts/blkid/images-fs/bcache-C.img.xz Binary files differnew file mode 100644 index 000000000..af90cbfd3 --- /dev/null +++ b/tests/ts/blkid/images-fs/bcache-C.img.xz diff --git a/tests/ts/blkid/images-fs/befs.img.bz2 b/tests/ts/blkid/images-fs/befs.img.bz2 Binary files differdeleted file mode 100644 index f4deaec4c..000000000 --- a/tests/ts/blkid/images-fs/befs.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/befs.img.xz b/tests/ts/blkid/images-fs/befs.img.xz Binary files differnew file mode 100644 index 000000000..188a6e8e8 --- /dev/null +++ b/tests/ts/blkid/images-fs/befs.img.xz diff --git a/tests/ts/blkid/images-fs/bfs.img.bz2 b/tests/ts/blkid/images-fs/bfs.img.bz2 Binary files differdeleted file mode 100644 index 54df48f77..000000000 --- a/tests/ts/blkid/images-fs/bfs.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/bfs.img.xz b/tests/ts/blkid/images-fs/bfs.img.xz Binary files differnew file mode 100644 index 000000000..98f024ab4 --- /dev/null +++ b/tests/ts/blkid/images-fs/bfs.img.xz diff --git a/tests/ts/blkid/images-fs/cramfs.img.bz2 b/tests/ts/blkid/images-fs/cramfs.img.bz2 Binary files differdeleted file mode 100644 index d6381168f..000000000 --- a/tests/ts/blkid/images-fs/cramfs.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/cramfs.img.xz b/tests/ts/blkid/images-fs/cramfs.img.xz Binary files differnew file mode 100644 index 000000000..594386799 --- /dev/null +++ b/tests/ts/blkid/images-fs/cramfs.img.xz diff --git a/tests/ts/blkid/images-fs/ddf-raid.img.bz2 b/tests/ts/blkid/images-fs/ddf-raid.img.bz2 Binary files differdeleted file mode 100644 index b09349337..000000000 --- a/tests/ts/blkid/images-fs/ddf-raid.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/ddf-raid.img.xz b/tests/ts/blkid/images-fs/ddf-raid.img.xz Binary files differnew file mode 100644 index 000000000..b5b64fe47 --- /dev/null +++ b/tests/ts/blkid/images-fs/ddf-raid.img.xz diff --git a/tests/ts/blkid/images-fs/drbdmanage-control-volume.img.bz2 b/tests/ts/blkid/images-fs/drbdmanage-control-volume.img.bz2 Binary files differdeleted file mode 100644 index 697905544..000000000 --- a/tests/ts/blkid/images-fs/drbdmanage-control-volume.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/drbdmanage-control-volume.img.xz b/tests/ts/blkid/images-fs/drbdmanage-control-volume.img.xz Binary files differnew file mode 100644 index 000000000..d31bfc175 --- /dev/null +++ b/tests/ts/blkid/images-fs/drbdmanage-control-volume.img.xz diff --git a/tests/ts/blkid/images-fs/exfat.img.bz2 b/tests/ts/blkid/images-fs/exfat.img.bz2 Binary files differdeleted file mode 100644 index f96c3f06e..000000000 --- a/tests/ts/blkid/images-fs/exfat.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/exfat.img.xz b/tests/ts/blkid/images-fs/exfat.img.xz Binary files differnew file mode 100644 index 000000000..43cc09a7c --- /dev/null +++ b/tests/ts/blkid/images-fs/exfat.img.xz diff --git a/tests/ts/blkid/images-fs/ext2.img.bz2 b/tests/ts/blkid/images-fs/ext2.img.bz2 Binary files differdeleted file mode 100644 index d1811ce3d..000000000 --- a/tests/ts/blkid/images-fs/ext2.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/ext2.img.xz b/tests/ts/blkid/images-fs/ext2.img.xz Binary files differnew file mode 100644 index 000000000..3b5489f1a --- /dev/null +++ b/tests/ts/blkid/images-fs/ext2.img.xz diff --git a/tests/ts/blkid/images-fs/ext3.img.bz2 b/tests/ts/blkid/images-fs/ext3.img.bz2 Binary files differdeleted file mode 100644 index 539459869..000000000 --- a/tests/ts/blkid/images-fs/ext3.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/ext3.img.xz b/tests/ts/blkid/images-fs/ext3.img.xz Binary files differnew file mode 100644 index 000000000..7d170e2c2 --- /dev/null +++ b/tests/ts/blkid/images-fs/ext3.img.xz diff --git a/tests/ts/blkid/images-fs/f2fs.img.bz2 b/tests/ts/blkid/images-fs/f2fs.img.bz2 Binary files differdeleted file mode 100644 index 82e86013d..000000000 --- a/tests/ts/blkid/images-fs/f2fs.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/f2fs.img.xz b/tests/ts/blkid/images-fs/f2fs.img.xz Binary files differnew file mode 100644 index 000000000..f7f9dde99 --- /dev/null +++ b/tests/ts/blkid/images-fs/f2fs.img.xz diff --git a/tests/ts/blkid/images-fs/fat.img.bz2 b/tests/ts/blkid/images-fs/fat.img.bz2 Binary files differdeleted file mode 100644 index 1fa7f2d9f..000000000 --- a/tests/ts/blkid/images-fs/fat.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/fat.img.xz b/tests/ts/blkid/images-fs/fat.img.xz Binary files differnew file mode 100644 index 000000000..4e0997a5a --- /dev/null +++ b/tests/ts/blkid/images-fs/fat.img.xz diff --git a/tests/ts/blkid/images-fs/fat16_noheads.img.bz2 b/tests/ts/blkid/images-fs/fat16_noheads.img.bz2 Binary files differdeleted file mode 100644 index 4d3d26c8c..000000000 --- a/tests/ts/blkid/images-fs/fat16_noheads.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/fat16_noheads.img.xz b/tests/ts/blkid/images-fs/fat16_noheads.img.xz Binary files differnew file mode 100644 index 000000000..a0ee29640 --- /dev/null +++ b/tests/ts/blkid/images-fs/fat16_noheads.img.xz diff --git a/tests/ts/blkid/images-fs/fat32_label_64MB.img.bz2 b/tests/ts/blkid/images-fs/fat32_label_64MB.img.bz2 Binary files differdeleted file mode 100644 index ca7629380..000000000 --- a/tests/ts/blkid/images-fs/fat32_label_64MB.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/fat32_label_64MB.img.xz b/tests/ts/blkid/images-fs/fat32_label_64MB.img.xz Binary files differnew file mode 100644 index 000000000..f0976bc91 --- /dev/null +++ b/tests/ts/blkid/images-fs/fat32_label_64MB.img.xz diff --git a/tests/ts/blkid/images-fs/gfs2.img.bz2 b/tests/ts/blkid/images-fs/gfs2.img.bz2 Binary files differdeleted file mode 100644 index bab2f901d..000000000 --- a/tests/ts/blkid/images-fs/gfs2.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/gfs2.img.xz b/tests/ts/blkid/images-fs/gfs2.img.xz Binary files differnew file mode 100644 index 000000000..22d4d6bc3 --- /dev/null +++ b/tests/ts/blkid/images-fs/gfs2.img.xz diff --git a/tests/ts/blkid/images-fs/hfs.img.bz2 b/tests/ts/blkid/images-fs/hfs.img.bz2 Binary files differdeleted file mode 100644 index d4fc1ab45..000000000 --- a/tests/ts/blkid/images-fs/hfs.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/hfs.img.xz b/tests/ts/blkid/images-fs/hfs.img.xz Binary files differnew file mode 100644 index 000000000..cfa3252cd --- /dev/null +++ b/tests/ts/blkid/images-fs/hfs.img.xz diff --git a/tests/ts/blkid/images-fs/hfsplus.img.bz2 b/tests/ts/blkid/images-fs/hfsplus.img.bz2 Binary files differdeleted file mode 100644 index b6ad1b976..000000000 --- a/tests/ts/blkid/images-fs/hfsplus.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/hfsplus.img.xz b/tests/ts/blkid/images-fs/hfsplus.img.xz Binary files differnew file mode 100644 index 000000000..1c37a70b1 --- /dev/null +++ b/tests/ts/blkid/images-fs/hfsplus.img.xz diff --git a/tests/ts/blkid/images-fs/hpfs.img.bz2 b/tests/ts/blkid/images-fs/hpfs.img.bz2 Binary files differdeleted file mode 100644 index a54e6dfcd..000000000 --- a/tests/ts/blkid/images-fs/hpfs.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/hpfs.img.xz b/tests/ts/blkid/images-fs/hpfs.img.xz Binary files differnew file mode 100644 index 000000000..4e22a8e54 --- /dev/null +++ b/tests/ts/blkid/images-fs/hpfs.img.xz diff --git a/tests/ts/blkid/images-fs/hpt37x-raid.img.bz2 b/tests/ts/blkid/images-fs/hpt37x-raid.img.bz2 Binary files differdeleted file mode 100644 index 52e13bb30..000000000 --- a/tests/ts/blkid/images-fs/hpt37x-raid.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/hpt37x-raid.img.xz b/tests/ts/blkid/images-fs/hpt37x-raid.img.xz Binary files differnew file mode 100644 index 000000000..1b53059fb --- /dev/null +++ b/tests/ts/blkid/images-fs/hpt37x-raid.img.xz diff --git a/tests/ts/blkid/images-fs/hpt45x-raid.img.bz2 b/tests/ts/blkid/images-fs/hpt45x-raid.img.bz2 Binary files differdeleted file mode 100644 index 1feaa5bea..000000000 --- a/tests/ts/blkid/images-fs/hpt45x-raid.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/hpt45x-raid.img.xz b/tests/ts/blkid/images-fs/hpt45x-raid.img.xz Binary files differnew file mode 100644 index 000000000..7dfe68acd --- /dev/null +++ b/tests/ts/blkid/images-fs/hpt45x-raid.img.xz diff --git a/tests/ts/blkid/images-fs/iso-joliet.img.bz2 b/tests/ts/blkid/images-fs/iso-joliet.img.bz2 Binary files differdeleted file mode 100644 index 4e43c0b8b..000000000 --- a/tests/ts/blkid/images-fs/iso-joliet.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/iso-joliet.img.xz b/tests/ts/blkid/images-fs/iso-joliet.img.xz Binary files differnew file mode 100644 index 000000000..16b896130 --- /dev/null +++ b/tests/ts/blkid/images-fs/iso-joliet.img.xz diff --git a/tests/ts/blkid/images-fs/iso-rr-joliet.img.bz2 b/tests/ts/blkid/images-fs/iso-rr-joliet.img.bz2 Binary files differdeleted file mode 100644 index 97e8b7692..000000000 --- a/tests/ts/blkid/images-fs/iso-rr-joliet.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/iso-rr-joliet.img.xz b/tests/ts/blkid/images-fs/iso-rr-joliet.img.xz Binary files differnew file mode 100644 index 000000000..1d6ad2c4b --- /dev/null +++ b/tests/ts/blkid/images-fs/iso-rr-joliet.img.xz diff --git a/tests/ts/blkid/images-fs/iso.img.bz2 b/tests/ts/blkid/images-fs/iso.img.bz2 Binary files differdeleted file mode 100644 index 43898475e..000000000 --- a/tests/ts/blkid/images-fs/iso.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/iso.img.xz b/tests/ts/blkid/images-fs/iso.img.xz Binary files differnew file mode 100644 index 000000000..f1146f3a0 --- /dev/null +++ b/tests/ts/blkid/images-fs/iso.img.xz diff --git a/tests/ts/blkid/images-fs/isw-raid.img.bz2 b/tests/ts/blkid/images-fs/isw-raid.img.bz2 Binary files differdeleted file mode 100644 index 9214c96f1..000000000 --- a/tests/ts/blkid/images-fs/isw-raid.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/isw-raid.img.xz b/tests/ts/blkid/images-fs/isw-raid.img.xz Binary files differnew file mode 100644 index 000000000..8e5529ac0 --- /dev/null +++ b/tests/ts/blkid/images-fs/isw-raid.img.xz diff --git a/tests/ts/blkid/images-fs/jbd.img.bz2 b/tests/ts/blkid/images-fs/jbd.img.bz2 Binary files differdeleted file mode 100644 index e6c4fc439..000000000 --- a/tests/ts/blkid/images-fs/jbd.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/jbd.img.xz b/tests/ts/blkid/images-fs/jbd.img.xz Binary files differnew file mode 100644 index 000000000..7c5a089bb --- /dev/null +++ b/tests/ts/blkid/images-fs/jbd.img.xz diff --git a/tests/ts/blkid/images-fs/jfs.img.bz2 b/tests/ts/blkid/images-fs/jfs.img.bz2 Binary files differdeleted file mode 100644 index 1d4d249eb..000000000 --- a/tests/ts/blkid/images-fs/jfs.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/jfs.img.xz b/tests/ts/blkid/images-fs/jfs.img.xz Binary files differnew file mode 100644 index 000000000..4780f6d0a --- /dev/null +++ b/tests/ts/blkid/images-fs/jfs.img.xz diff --git a/tests/ts/blkid/images-fs/jmicron-raid.img.bz2 b/tests/ts/blkid/images-fs/jmicron-raid.img.bz2 Binary files differdeleted file mode 100644 index 3b4b23670..000000000 --- a/tests/ts/blkid/images-fs/jmicron-raid.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/jmicron-raid.img.xz b/tests/ts/blkid/images-fs/jmicron-raid.img.xz Binary files differnew file mode 100644 index 000000000..cde0811c6 --- /dev/null +++ b/tests/ts/blkid/images-fs/jmicron-raid.img.xz diff --git a/tests/ts/blkid/images-fs/lsi-raid.img.bz2 b/tests/ts/blkid/images-fs/lsi-raid.img.bz2 Binary files differdeleted file mode 100644 index ffd75c3a2..000000000 --- a/tests/ts/blkid/images-fs/lsi-raid.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/lsi-raid.img.xz b/tests/ts/blkid/images-fs/lsi-raid.img.xz Binary files differnew file mode 100644 index 000000000..d6ae15aac --- /dev/null +++ b/tests/ts/blkid/images-fs/lsi-raid.img.xz diff --git a/tests/ts/blkid/images-fs/lvm2.img.bz2 b/tests/ts/blkid/images-fs/lvm2.img.bz2 Binary files differdeleted file mode 100644 index 7bb84bf4d..000000000 --- a/tests/ts/blkid/images-fs/lvm2.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/lvm2.img.xz b/tests/ts/blkid/images-fs/lvm2.img.xz Binary files differnew file mode 100644 index 000000000..4c3c183fb --- /dev/null +++ b/tests/ts/blkid/images-fs/lvm2.img.xz diff --git a/tests/ts/blkid/images-fs/mdraid.img.bz2 b/tests/ts/blkid/images-fs/mdraid.img.bz2 Binary files differdeleted file mode 100644 index d5a67a34d..000000000 --- a/tests/ts/blkid/images-fs/mdraid.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/mdraid.img.xz b/tests/ts/blkid/images-fs/mdraid.img.xz Binary files differnew file mode 100644 index 000000000..e8ff4f55c --- /dev/null +++ b/tests/ts/blkid/images-fs/mdraid.img.xz diff --git a/tests/ts/blkid/images-fs/minix-BE.img.bz2 b/tests/ts/blkid/images-fs/minix-BE.img.bz2 Binary files differdeleted file mode 100644 index 073028316..000000000 --- a/tests/ts/blkid/images-fs/minix-BE.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/minix-BE.img.xz b/tests/ts/blkid/images-fs/minix-BE.img.xz Binary files differnew file mode 100644 index 000000000..c349a4f85 --- /dev/null +++ b/tests/ts/blkid/images-fs/minix-BE.img.xz diff --git a/tests/ts/blkid/images-fs/minix-LE.img.bz2 b/tests/ts/blkid/images-fs/minix-LE.img.bz2 Binary files differdeleted file mode 100644 index c6674c951..000000000 --- a/tests/ts/blkid/images-fs/minix-LE.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/minix-LE.img.xz b/tests/ts/blkid/images-fs/minix-LE.img.xz Binary files differnew file mode 100644 index 000000000..da646a8b4 --- /dev/null +++ b/tests/ts/blkid/images-fs/minix-LE.img.xz diff --git a/tests/ts/blkid/images-fs/netware.img.bz2 b/tests/ts/blkid/images-fs/netware.img.bz2 Binary files differdeleted file mode 100644 index 9c2067304..000000000 --- a/tests/ts/blkid/images-fs/netware.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/netware.img.xz b/tests/ts/blkid/images-fs/netware.img.xz Binary files differnew file mode 100644 index 000000000..fe5b1030e --- /dev/null +++ b/tests/ts/blkid/images-fs/netware.img.xz diff --git a/tests/ts/blkid/images-fs/nilfs2.img.bz2 b/tests/ts/blkid/images-fs/nilfs2.img.bz2 Binary files differdeleted file mode 100644 index a9762eb1a..000000000 --- a/tests/ts/blkid/images-fs/nilfs2.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/nilfs2.img.xz b/tests/ts/blkid/images-fs/nilfs2.img.xz Binary files differnew file mode 100644 index 000000000..38de64561 --- /dev/null +++ b/tests/ts/blkid/images-fs/nilfs2.img.xz diff --git a/tests/ts/blkid/images-fs/ntfs.img.bz2 b/tests/ts/blkid/images-fs/ntfs.img.bz2 Binary files differdeleted file mode 100644 index dc1249ff8..000000000 --- a/tests/ts/blkid/images-fs/ntfs.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/ntfs.img.xz b/tests/ts/blkid/images-fs/ntfs.img.xz Binary files differnew file mode 100644 index 000000000..2b414c48f --- /dev/null +++ b/tests/ts/blkid/images-fs/ntfs.img.xz diff --git a/tests/ts/blkid/images-fs/nvidia-raid.img.bz2 b/tests/ts/blkid/images-fs/nvidia-raid.img.bz2 Binary files differdeleted file mode 100644 index 21f062e10..000000000 --- a/tests/ts/blkid/images-fs/nvidia-raid.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/nvidia-raid.img.xz b/tests/ts/blkid/images-fs/nvidia-raid.img.xz Binary files differnew file mode 100644 index 000000000..775f810ed --- /dev/null +++ b/tests/ts/blkid/images-fs/nvidia-raid.img.xz diff --git a/tests/ts/blkid/images-fs/ocfs2.img.bz2 b/tests/ts/blkid/images-fs/ocfs2.img.bz2 Binary files differdeleted file mode 100644 index 7e203dae5..000000000 --- a/tests/ts/blkid/images-fs/ocfs2.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/ocfs2.img.xz b/tests/ts/blkid/images-fs/ocfs2.img.xz Binary files differnew file mode 100644 index 000000000..12ed92645 --- /dev/null +++ b/tests/ts/blkid/images-fs/ocfs2.img.xz diff --git a/tests/ts/blkid/images-fs/promise-raid.img.bz2 b/tests/ts/blkid/images-fs/promise-raid.img.bz2 Binary files differdeleted file mode 100644 index 64a5a08b8..000000000 --- a/tests/ts/blkid/images-fs/promise-raid.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/promise-raid.img.xz b/tests/ts/blkid/images-fs/promise-raid.img.xz Binary files differnew file mode 100644 index 000000000..77f135f4a --- /dev/null +++ b/tests/ts/blkid/images-fs/promise-raid.img.xz diff --git a/tests/ts/blkid/images-fs/reiser3.img.bz2 b/tests/ts/blkid/images-fs/reiser3.img.bz2 Binary files differdeleted file mode 100644 index 1802bc213..000000000 --- a/tests/ts/blkid/images-fs/reiser3.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/reiser3.img.xz b/tests/ts/blkid/images-fs/reiser3.img.xz Binary files differnew file mode 100644 index 000000000..8bc595f2a --- /dev/null +++ b/tests/ts/blkid/images-fs/reiser3.img.xz diff --git a/tests/ts/blkid/images-fs/reiser4.img.bz2 b/tests/ts/blkid/images-fs/reiser4.img.bz2 Binary files differdeleted file mode 100644 index d07571eb4..000000000 --- a/tests/ts/blkid/images-fs/reiser4.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/reiser4.img.xz b/tests/ts/blkid/images-fs/reiser4.img.xz Binary files differnew file mode 100644 index 000000000..e97f96073 --- /dev/null +++ b/tests/ts/blkid/images-fs/reiser4.img.xz diff --git a/tests/ts/blkid/images-fs/romfs.img.bz2 b/tests/ts/blkid/images-fs/romfs.img.bz2 Binary files differdeleted file mode 100644 index f94d77b60..000000000 --- a/tests/ts/blkid/images-fs/romfs.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/romfs.img.xz b/tests/ts/blkid/images-fs/romfs.img.xz Binary files differnew file mode 100644 index 000000000..680eeed18 --- /dev/null +++ b/tests/ts/blkid/images-fs/romfs.img.xz diff --git a/tests/ts/blkid/images-fs/silicon-raid.img.bz2 b/tests/ts/blkid/images-fs/silicon-raid.img.bz2 Binary files differdeleted file mode 100644 index e3ccbf97e..000000000 --- a/tests/ts/blkid/images-fs/silicon-raid.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/silicon-raid.img.xz b/tests/ts/blkid/images-fs/silicon-raid.img.xz Binary files differnew file mode 100644 index 000000000..28d6a425f --- /dev/null +++ b/tests/ts/blkid/images-fs/silicon-raid.img.xz diff --git a/tests/ts/blkid/images-fs/small-fat32.img.bz2 b/tests/ts/blkid/images-fs/small-fat32.img.bz2 Binary files differdeleted file mode 100644 index 8b90f9c3c..000000000 --- a/tests/ts/blkid/images-fs/small-fat32.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/small-fat32.img.xz b/tests/ts/blkid/images-fs/small-fat32.img.xz Binary files differnew file mode 100644 index 000000000..7a04f42b4 --- /dev/null +++ b/tests/ts/blkid/images-fs/small-fat32.img.xz diff --git a/tests/ts/blkid/images-fs/swap0.img.bz2 b/tests/ts/blkid/images-fs/swap0.img.bz2 Binary files differdeleted file mode 100644 index d027b6fbf..000000000 --- a/tests/ts/blkid/images-fs/swap0.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/swap0.img.xz b/tests/ts/blkid/images-fs/swap0.img.xz Binary files differnew file mode 100644 index 000000000..3cfea73c5 --- /dev/null +++ b/tests/ts/blkid/images-fs/swap0.img.xz diff --git a/tests/ts/blkid/images-fs/swap1.img.bz2 b/tests/ts/blkid/images-fs/swap1.img.bz2 Binary files differdeleted file mode 100644 index 37adedd9f..000000000 --- a/tests/ts/blkid/images-fs/swap1.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/swap1.img.xz b/tests/ts/blkid/images-fs/swap1.img.xz Binary files differnew file mode 100644 index 000000000..6e6f53951 --- /dev/null +++ b/tests/ts/blkid/images-fs/swap1.img.xz diff --git a/tests/ts/blkid/images-fs/tuxonice.img.bz2 b/tests/ts/blkid/images-fs/tuxonice.img.bz2 Binary files differdeleted file mode 100644 index a70c95ad1..000000000 --- a/tests/ts/blkid/images-fs/tuxonice.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/tuxonice.img.xz b/tests/ts/blkid/images-fs/tuxonice.img.xz Binary files differnew file mode 100644 index 000000000..472cf9cb8 --- /dev/null +++ b/tests/ts/blkid/images-fs/tuxonice.img.xz diff --git a/tests/ts/blkid/images-fs/ubifs.img.bz2 b/tests/ts/blkid/images-fs/ubifs.img.bz2 Binary files differdeleted file mode 100644 index efba8f75e..000000000 --- a/tests/ts/blkid/images-fs/ubifs.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/ubifs.img.xz b/tests/ts/blkid/images-fs/ubifs.img.xz Binary files differnew file mode 100644 index 000000000..2004f5bdb --- /dev/null +++ b/tests/ts/blkid/images-fs/ubifs.img.xz diff --git a/tests/ts/blkid/images-fs/udf-hdd-mkudffs.img.bz2 b/tests/ts/blkid/images-fs/udf-hdd-mkudffs.img.bz2 Binary files differdeleted file mode 100644 index b088d0fe6..000000000 --- a/tests/ts/blkid/images-fs/udf-hdd-mkudffs.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/udf-hdd-mkudffs.img.xz b/tests/ts/blkid/images-fs/udf-hdd-mkudffs.img.xz Binary files differnew file mode 100644 index 000000000..39db4be3e --- /dev/null +++ b/tests/ts/blkid/images-fs/udf-hdd-mkudffs.img.xz diff --git a/tests/ts/blkid/images-fs/udf-hdd-mkudffs2.img.bz2 b/tests/ts/blkid/images-fs/udf-hdd-mkudffs2.img.bz2 Binary files differdeleted file mode 100644 index a3b917829..000000000 --- a/tests/ts/blkid/images-fs/udf-hdd-mkudffs2.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/udf-hdd-mkudffs2.img.xz b/tests/ts/blkid/images-fs/udf-hdd-mkudffs2.img.xz Binary files differnew file mode 100644 index 000000000..4cba447bf --- /dev/null +++ b/tests/ts/blkid/images-fs/udf-hdd-mkudffs2.img.xz 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 Binary files differdeleted file mode 100644 index 9b4a84680..000000000 --- a/tests/ts/blkid/images-fs/udf-hdd-udfclient-0.7.5.img.bz2 +++ /dev/null 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 Binary files differnew file mode 100644 index 000000000..baddc8421 --- /dev/null +++ b/tests/ts/blkid/images-fs/udf-hdd-udfclient-0.7.5.img.xz 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 Binary files differdeleted file mode 100644 index f81be623f..000000000 --- a/tests/ts/blkid/images-fs/udf-hdd-udfclient-0.7.7.img.bz2 +++ /dev/null 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 Binary files differnew file mode 100644 index 000000000..dfb8cdb1a --- /dev/null +++ b/tests/ts/blkid/images-fs/udf-hdd-udfclient-0.7.7.img.xz diff --git a/tests/ts/blkid/images-fs/udf-hdd-win7.img.bz2 b/tests/ts/blkid/images-fs/udf-hdd-win7.img.bz2 Binary files differdeleted file mode 100644 index d6ce778c5..000000000 --- a/tests/ts/blkid/images-fs/udf-hdd-win7.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/udf-hdd-win7.img.xz b/tests/ts/blkid/images-fs/udf-hdd-win7.img.xz Binary files differnew file mode 100644 index 000000000..ee8611544 --- /dev/null +++ b/tests/ts/blkid/images-fs/udf-hdd-win7.img.xz diff --git a/tests/ts/blkid/images-fs/udf.img.bz2 b/tests/ts/blkid/images-fs/udf.img.bz2 Binary files differdeleted file mode 100644 index bd2deb0af..000000000 --- a/tests/ts/blkid/images-fs/udf.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/udf.img.xz b/tests/ts/blkid/images-fs/udf.img.xz Binary files differnew file mode 100644 index 000000000..fdf0edfe2 --- /dev/null +++ b/tests/ts/blkid/images-fs/udf.img.xz diff --git a/tests/ts/blkid/images-fs/ufs.img.bz2 b/tests/ts/blkid/images-fs/ufs.img.bz2 Binary files differdeleted file mode 100644 index 67abbeddb..000000000 --- a/tests/ts/blkid/images-fs/ufs.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/ufs.img.xz b/tests/ts/blkid/images-fs/ufs.img.xz Binary files differnew file mode 100644 index 000000000..58f8b20b9 --- /dev/null +++ b/tests/ts/blkid/images-fs/ufs.img.xz diff --git a/tests/ts/blkid/images-fs/via-raid.img.bz2 b/tests/ts/blkid/images-fs/via-raid.img.bz2 Binary files differdeleted file mode 100644 index 9266f5e91..000000000 --- a/tests/ts/blkid/images-fs/via-raid.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/via-raid.img.xz b/tests/ts/blkid/images-fs/via-raid.img.xz Binary files differnew file mode 100644 index 000000000..c5f6fb7f8 --- /dev/null +++ b/tests/ts/blkid/images-fs/via-raid.img.xz diff --git a/tests/ts/blkid/images-fs/vmfs.img.bz2 b/tests/ts/blkid/images-fs/vmfs.img.bz2 Binary files differdeleted file mode 100644 index 09401430f..000000000 --- a/tests/ts/blkid/images-fs/vmfs.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/vmfs.img.xz b/tests/ts/blkid/images-fs/vmfs.img.xz Binary files differnew file mode 100644 index 000000000..ce4544e95 --- /dev/null +++ b/tests/ts/blkid/images-fs/vmfs.img.xz diff --git a/tests/ts/blkid/images-fs/vmfs_volume.img.bz2 b/tests/ts/blkid/images-fs/vmfs_volume.img.bz2 Binary files differdeleted file mode 100644 index cc0ec6647..000000000 --- a/tests/ts/blkid/images-fs/vmfs_volume.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/vmfs_volume.img.xz b/tests/ts/blkid/images-fs/vmfs_volume.img.xz Binary files differnew file mode 100644 index 000000000..93f11b4e8 --- /dev/null +++ b/tests/ts/blkid/images-fs/vmfs_volume.img.xz diff --git a/tests/ts/blkid/images-fs/xfs-log.img.bz2 b/tests/ts/blkid/images-fs/xfs-log.img.bz2 Binary files differdeleted file mode 100644 index 660846c81..000000000 --- a/tests/ts/blkid/images-fs/xfs-log.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/xfs-log.img.xz b/tests/ts/blkid/images-fs/xfs-log.img.xz Binary files differnew file mode 100644 index 000000000..35ff33b1c --- /dev/null +++ b/tests/ts/blkid/images-fs/xfs-log.img.xz diff --git a/tests/ts/blkid/images-fs/xfs.img.bz2 b/tests/ts/blkid/images-fs/xfs.img.bz2 Binary files differdeleted file mode 100644 index cf6982b4a..000000000 --- a/tests/ts/blkid/images-fs/xfs.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/xfs.img.xz b/tests/ts/blkid/images-fs/xfs.img.xz Binary files differnew file mode 100644 index 000000000..5576c669b --- /dev/null +++ b/tests/ts/blkid/images-fs/xfs.img.xz diff --git a/tests/ts/blkid/images-fs/zfs.img.bz2 b/tests/ts/blkid/images-fs/zfs.img.bz2 Binary files differdeleted file mode 100644 index dfaaef01b..000000000 --- a/tests/ts/blkid/images-fs/zfs.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-fs/zfs.img.xz b/tests/ts/blkid/images-fs/zfs.img.xz Binary files differnew file mode 100644 index 000000000..f85e536db --- /dev/null +++ b/tests/ts/blkid/images-fs/zfs.img.xz diff --git a/tests/ts/blkid/images-pt/bsd.img.bz2 b/tests/ts/blkid/images-pt/bsd.img.bz2 Binary files differdeleted file mode 100644 index c4b05e432..000000000 --- a/tests/ts/blkid/images-pt/bsd.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-pt/bsd.img.xz b/tests/ts/blkid/images-pt/bsd.img.xz Binary files differnew file mode 100644 index 000000000..bfdb50bc7 --- /dev/null +++ b/tests/ts/blkid/images-pt/bsd.img.xz diff --git a/tests/ts/blkid/images-pt/dos+bsd.img.bz2 b/tests/ts/blkid/images-pt/dos+bsd.img.bz2 Binary files differdeleted file mode 100644 index cccdd8a9b..000000000 --- a/tests/ts/blkid/images-pt/dos+bsd.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-pt/dos+bsd.img.xz b/tests/ts/blkid/images-pt/dos+bsd.img.xz Binary files differnew file mode 100644 index 000000000..f87dd7416 --- /dev/null +++ b/tests/ts/blkid/images-pt/dos+bsd.img.xz diff --git a/tests/ts/blkid/images-pt/gpt.img.bz2 b/tests/ts/blkid/images-pt/gpt.img.bz2 Binary files differdeleted file mode 100644 index df4de7c57..000000000 --- a/tests/ts/blkid/images-pt/gpt.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-pt/gpt.img.xz b/tests/ts/blkid/images-pt/gpt.img.xz Binary files differnew file mode 100644 index 000000000..9a085b466 --- /dev/null +++ b/tests/ts/blkid/images-pt/gpt.img.xz diff --git a/tests/ts/blkid/images-pt/sgi.img.bz2 b/tests/ts/blkid/images-pt/sgi.img.bz2 Binary files differdeleted file mode 100644 index 3b1c31395..000000000 --- a/tests/ts/blkid/images-pt/sgi.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-pt/sgi.img.xz b/tests/ts/blkid/images-pt/sgi.img.xz Binary files differnew file mode 100644 index 000000000..d5fed8070 --- /dev/null +++ b/tests/ts/blkid/images-pt/sgi.img.xz diff --git a/tests/ts/blkid/images-pt/sun.img.bz2 b/tests/ts/blkid/images-pt/sun.img.bz2 Binary files differdeleted file mode 100644 index adf4f02e8..000000000 --- a/tests/ts/blkid/images-pt/sun.img.bz2 +++ /dev/null diff --git a/tests/ts/blkid/images-pt/sun.img.xz b/tests/ts/blkid/images-pt/sun.img.xz Binary files differnew file mode 100644 index 000000000..a00594ab6 --- /dev/null +++ b/tests/ts/blkid/images-pt/sun.img.xz 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/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 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 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 |