summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Rockai <prockai@redhat.com>2013-08-23 10:09:23 +0200
committerPetr Rockai <prockai@redhat.com>2013-08-28 14:53:23 +0200
commit64fe17dc94ce3b7cc547c9fc544c34460d99d5b3 (patch)
tree634b5807a4fae7ee3fcea2814aa4c48a969bd4da
parentb516a72b117eeee627f469369fadf56caf3041a7 (diff)
downloadlvm2-64fe17dc94ce3b7cc547c9fc544c34460d99d5b3.tar.gz
test: Add a new "check_full" target, which also tests with real /dev.
The original "check" target stays confined to a local device directory, while check_full does 6 flavours, 3 with a local device directory and 3 with the global /dev directory (the latter are prefixed with "s" for "system"). I.e.: normal, cluster, lvmetad, snormal, scluster, slvmetad.
-rw-r--r--Makefile.in2
-rw-r--r--test/Makefile.in16
2 files changed, 17 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index 2ee20e54b..81002ea17 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -94,7 +94,7 @@ all: cscope.out
endif
DISTCLEAN_TARGETS += cscope.out
-check check_cluster check_local check_lvmetad unit: all
+check check_full check_cluster check_local check_lvmetad unit: all
$(MAKE) -C test $(@)
install_system_dirs:
diff --git a/test/Makefile.in b/test/Makefile.in
index 89092d077..b663e7a6c 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -77,6 +77,22 @@ check: .tests-stamp
$(patsubst %,cluster:%,$(RUN_BASE)) \
$(patsubst %,lvmetad:%,$(RUN_BASE))
+check_full: .tests-stamp
+ VERBOSE=$(VEROSE) \
+ cluster_LVM_TEST_LOCKING=3 \
+ scluster_LVM_TEST_LOCKING=3 \
+ lvmetad_LVM_TEST_LVMETAD=1 \
+ slvmetad_LVM_TEST_LVMETAD=1 \
+ snormal_LVM_TEST_DEVDIR=/dev \
+ scluster_LVM_TEST_DEVDIR=/dev \
+ slvmetad_LVM_TEST_DEVDIR=/dev \
+ ./lib/harness $(patsubst %,normal:%,$(RUN_BASE)) \
+ $(patsubst %,cluster:%,$(RUN_BASE)) \
+ $(patsubst %,lvmetad:%,$(RUN_BASE)) \
+ $(patsubst %,snormal:%,$(RUN_BASE)) \
+ $(patsubst %,scluster:%,$(RUN_BASE)) \
+ $(patsubst %,slvmetad:%,$(RUN_BASE))
+
check_cluster: .tests-stamp
@echo Testing with locking_type 3
VERBOSE=$(VERBOSE) LVM_TEST_LOCKING=3 ./lib/harness $(RUN_BASE)