diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2012-08-31 14:30:10 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-08-31 14:31:22 +0100 |
| commit | b17d1896168bed2dc4c8c82bc368e79e10b14457 (patch) | |
| tree | 54adfbc376a90176b322c2cb5979b66520e76e9a /generator | |
| parent | 87cb1549761c9441b0fa7ee9b6a85b8eeb164c5c (diff) | |
| download | libguestfs-b17d1896168bed2dc4c8c82bc368e79e10b14457.tar.gz libguestfs-b17d1896168bed2dc4c8c82bc368e79e10b14457.tar.xz libguestfs-b17d1896168bed2dc4c8c82bc368e79e10b14457.zip | |
tests: Make mkswap and tar tests conditional on linuxfsuuid and xz features.
Diffstat (limited to 'generator')
| -rw-r--r-- | generator/generator_actions.ml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generator/generator_actions.ml b/generator/generator_actions.ml index 0033e3ac..79ed8f49 100644 --- a/generator/generator_actions.ml +++ b/generator/generator_actions.ml @@ -3655,7 +3655,7 @@ To get the checksums for many files, use C<guestfs_checksums_out>." }; [["mkdir"; "/tar_in_gz"]; ["tar_in"; "../data/helloworld.tar.gz"; "/tar_in_gz"; "gzip"]; ["cat"; "/tar_in_gz/hello"]], "hello\n"); - InitScratchFS, Always, TestOutput ( + InitScratchFS, IfAvailable "xz", TestOutput ( [["mkdir"; "/tar_in_xz"]; ["tar_in"; "../data/helloworld.tar.xz"; "/tar_in_xz"; "xz"]; ["cat"; "/tar_in_xz/hello"]], "hello\n") @@ -4934,10 +4934,10 @@ the command C<mount -o loop file mountpoint>." }; InitEmpty, Always, TestRun ( [["part_disk"; "/dev/sda"; "mbr"]; ["mkswap"; "/dev/sda1"; "hello"; "NOARG"]]); - InitEmpty, Always, TestRun ( + InitEmpty, IfAvailable "linuxfsuuid", TestRun ( [["part_disk"; "/dev/sda"; "mbr"]; ["mkswap"; "/dev/sda1"; "NOARG"; uuid]]); - InitEmpty, Always, TestRun ( + InitEmpty, IfAvailable "linuxfsuuid", TestRun ( [["part_disk"; "/dev/sda"; "mbr"]; ["mkswap"; "/dev/sda1"; "hello"; uuid]]) ]); |