diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2012-06-22 08:41:14 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-06-28 09:08:57 +0100 |
| commit | 2fa9779b81bc6dff11eb10644755ca9063e8865f (patch) | |
| tree | 9f7971f01ba7b91ded152c8dc12790e2da01ed9d /tests | |
| parent | db13ec83dc626ae73dd14badef0c05d17e85b42d (diff) | |
| download | libguestfs-2fa9779b81bc6dff11eb10644755ca9063e8865f.tar.gz libguestfs-2fa9779b81bc6dff11eb10644755ca9063e8865f.tar.xz libguestfs-2fa9779b81bc6dff11eb10644755ca9063e8865f.zip | |
tests: Add SKIP_TEST_* variables to allow these tests to be skipped.
By setting these variables, we can skip tests that fail on
RHEL 5.
(cherry picked from commit 145f35badfd9ca4a6d9f54f7732566a5e5114876)
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/md/test-inspect-fstab-md.sh | 5 | ||||
| -rwxr-xr-x | tests/md/test-list-filesystems.sh | 5 | ||||
| -rwxr-xr-x | tests/md/test-list-md-devices.sh | 5 | ||||
| -rwxr-xr-x | tests/md/test-mdadm.sh | 5 | ||||
| -rwxr-xr-x | tests/ntfsclone/test-ntfsclone.sh | 5 | ||||
| -rwxr-xr-x | tests/regressions/rhbz690819.sh | 5 |
6 files changed, 30 insertions, 0 deletions
diff --git a/tests/md/test-inspect-fstab-md.sh b/tests/md/test-inspect-fstab-md.sh index 1804d33e..a64cbe09 100755 --- a/tests/md/test-inspect-fstab-md.sh +++ b/tests/md/test-inspect-fstab-md.sh @@ -21,6 +21,11 @@ set -e export LANG=C +if [ -n "$SKIP_TEST_INSPECT_FSTAB_MD_SH" ]; then + echo "$0: test skipped because environment variable is set." + exit 0 +fi + # The first test requires a new Augeas lens for parsing mdadm.conf. # If this is not present in the appliance or on the host, skip the # test. diff --git a/tests/md/test-list-filesystems.sh b/tests/md/test-list-filesystems.sh index b9a03408..f52afb00 100755 --- a/tests/md/test-list-filesystems.sh +++ b/tests/md/test-list-filesystems.sh @@ -20,6 +20,11 @@ set -e +if [ -n "$SKIP_TEST_LIST_FILESYSTEMS_SH" ]; then + echo "$0: test skipped because environment variable is set." + exit 0 +fi + rm -f test.output # Create 2 disks partitioned as: diff --git a/tests/md/test-list-md-devices.sh b/tests/md/test-list-md-devices.sh index 99283be5..ad9e5b54 100755 --- a/tests/md/test-list-md-devices.sh +++ b/tests/md/test-list-md-devices.sh @@ -20,6 +20,11 @@ set -e +if [ -n "$SKIP_TEST_LIST_MD_DEVICES_SH" ]; then + echo "$0: test skipped because environment variable is set." + exit 0 +fi + output=$( ../../fish/guestfish <<EOF # Add 2 empty disks diff --git a/tests/md/test-mdadm.sh b/tests/md/test-mdadm.sh index 620dcfd9..91fcca3d 100755 --- a/tests/md/test-mdadm.sh +++ b/tests/md/test-mdadm.sh @@ -20,6 +20,11 @@ set -e +if [ -n "$SKIP_TEST_MDADM_SH" ]; then + echo "$0: test skipped because environment variable is set." + exit 0 +fi + rm -f md-test1.img md-test2.img md-test3.img md-test4.img ../../fish/guestfish <<EOF diff --git a/tests/ntfsclone/test-ntfsclone.sh b/tests/ntfsclone/test-ntfsclone.sh index 2dc4fe8b..999cbfbf 100755 --- a/tests/ntfsclone/test-ntfsclone.sh +++ b/tests/ntfsclone/test-ntfsclone.sh @@ -20,6 +20,11 @@ set -e +if [ -n "$SKIP_TEST_NTFSCLONE_SH" ]; then + echo "$0: test skipped because environment variable is set." + exit 0 +fi + rm -f test1.img backup1 backup2 guestfish=../../fish/guestfish diff --git a/tests/regressions/rhbz690819.sh b/tests/regressions/rhbz690819.sh index 9d8e38ca..e3f9bb89 100755 --- a/tests/regressions/rhbz690819.sh +++ b/tests/regressions/rhbz690819.sh @@ -35,6 +35,11 @@ set -e export LANG=C +if [ -n "$SKIP_TEST_RHBZ690819_SH" ]; then + echo "$0: test skipped because environment variable is set." + exit 0 +fi + rm -f test.img ../../fish/guestfish sparse test.img 100M |