diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2015-10-27 15:10:06 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2015-10-27 16:00:09 +0100 |
| commit | 4159680a0ee7eceb4d5124c1e4e78b418b12f357 (patch) | |
| tree | cfce128aaa605be7f40a464068f3189ffcd20104 /test/api | |
| parent | 76cff10a734a7c1e26b3835ff967dac0b7e46bcb (diff) | |
| download | lvm2-4159680a0ee7eceb4d5124c1e4e78b418b12f357.tar.gz | |
tests: use more SKIP
Speed-up check_lvmpolld.
Diffstat (limited to 'test/api')
| -rw-r--r-- | test/api/lvtest.sh | 2 | ||||
| -rw-r--r-- | test/api/pe_start.sh | 2 | ||||
| -rw-r--r-- | test/api/percent.sh | 2 | ||||
| -rw-r--r-- | test/api/pytest.sh | 10 | ||||
| -rw-r--r-- | test/api/thin_percent.sh | 2 | ||||
| -rw-r--r-- | test/api/vglist.sh | 2 |
6 files changed, 15 insertions, 5 deletions
diff --git a/test/api/lvtest.sh b/test/api/lvtest.sh index 5fe6f577f..aacceba32 100644 --- a/test/api/lvtest.sh +++ b/test/api/lvtest.sh @@ -11,6 +11,8 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +SKIP_WITH_LVMPOLLD=1 + . lib/inittest aux prepare_vg 1 diff --git a/test/api/pe_start.sh b/test/api/pe_start.sh index 2fc118fd5..6a47ced8f 100644 --- a/test/api/pe_start.sh +++ b/test/api/pe_start.sh @@ -11,6 +11,8 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +SKIP_WITH_LVMPOLLD=1 + . lib/inittest aux prepare_devs 2 diff --git a/test/api/percent.sh b/test/api/percent.sh index a9b7b90a6..d57408020 100644 --- a/test/api/percent.sh +++ b/test/api/percent.sh @@ -11,6 +11,8 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +SKIP_WITH_LVMPOLLD=1 + . lib/inittest aux kernel_at_least 2 6 33 || skip diff --git a/test/api/pytest.sh b/test/api/pytest.sh index 3b7c5b668..7ede416f2 100644 --- a/test/api/pytest.sh +++ b/test/api/pytest.sh @@ -11,8 +11,13 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +SKIP_WITH_LVMETAD=1 +SKIP_WITH_CLVMD=1 + . lib/inittest +aux prepare_dmeventd + # # TODO: # lvm2app is not yet capable to respect many lvm.conf options @@ -29,11 +34,6 @@ python_lib=$(find $abs_top_builddir -name lvm.so) # Unable to test python bindings if library not available test -n "$python_lib" || skip -test -e LOCAL_CLVMD && skip -test -e LOCAL_LVMETAD && skip - -aux prepare_dmeventd - #If you change this change the unit test case too. aux prepare_pvs 6 diff --git a/test/api/thin_percent.sh b/test/api/thin_percent.sh index fd64e3bba..cd95e4fb0 100644 --- a/test/api/thin_percent.sh +++ b/test/api/thin_percent.sh @@ -11,6 +11,8 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +SKIP_WITH_LVMPOLLD=1 + export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false} . lib/inittest diff --git a/test/api/vglist.sh b/test/api/vglist.sh index 421705b14..66cf7bfd5 100644 --- a/test/api/vglist.sh +++ b/test/api/vglist.sh @@ -9,6 +9,8 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +SKIP_WITH_LVMPOLLD=1 + . lib/inittest aux prepare_vg 2 |