test: include the same Makefile.testdir

diff --git a/test/TEST-01-BASIC/Makefile b/test/TEST-01-BASIC/Makefile
index aad27059472a34837e6b7b798ca092bb029b6df2..2dcab8164b7715b6778f23cbd71787078155544d 100644 (file)
--- a/test/TEST-01-BASIC/Makefile
+++ b/test/TEST-01-BASIC/Makefile
@@ -1,10 +1 @@
-all:
-       @$(MAKE) -s --no-print-directory -C ../.. all
-       @V=$(V) basedir=../.. testdir=../ ./test.sh --all
-setup:
-       @$(MAKE) --no-print-directory -C ../.. all
-       @basedir=../.. testdir=../ ./test.sh --setup
-clean:
-       @basedir=../.. testdir=../ ./test.sh --clean
-run:
-       @basedir=../.. testdir=../ ./test.sh --run
+-include ../Makefile.testdir

diff --git a/test/TEST-02-SYSTEMD/Makefile b/test/TEST-02-SYSTEMD/Makefile
index aad27059472a34837e6b7b798ca092bb029b6df2..2dcab8164b7715b6778f23cbd71787078155544d 100644 (file)
--- a/test/TEST-02-SYSTEMD/Makefile
+++ b/test/TEST-02-SYSTEMD/Makefile
@@ -1,10 +1 @@
-all:
-       @$(MAKE) -s --no-print-directory -C ../.. all
-       @V=$(V) basedir=../.. testdir=../ ./test.sh --all
-setup:
-       @$(MAKE) --no-print-directory -C ../.. all
-       @basedir=../.. testdir=../ ./test.sh --setup
-clean:
-       @basedir=../.. testdir=../ ./test.sh --clean
-run:
-       @basedir=../.. testdir=../ ./test.sh --run
+-include ../Makefile.testdir

diff --git a/test/TEST-03-USR-MOUNT/Makefile b/test/TEST-03-USR-MOUNT/Makefile
index aad27059472a34837e6b7b798ca092bb029b6df2..2dcab8164b7715b6778f23cbd71787078155544d 100644 (file)
--- a/test/TEST-03-USR-MOUNT/Makefile
+++ b/test/TEST-03-USR-MOUNT/Makefile
@@ -1,10 +1 @@
-all:
-       @$(MAKE) -s --no-print-directory -C ../.. all
-       @V=$(V) basedir=../.. testdir=../ ./test.sh --all
-setup:
-       @$(MAKE) --no-print-directory -C ../.. all
-       @basedir=../.. testdir=../ ./test.sh --setup
-clean:
-       @basedir=../.. testdir=../ ./test.sh --clean
-run:
-       @basedir=../.. testdir=../ ./test.sh --run
+-include ../Makefile.testdir

diff --git a/test/TEST-04-FULL-SYSTEMD/Makefile b/test/TEST-04-FULL-SYSTEMD/Makefile
index aad27059472a34837e6b7b798ca092bb029b6df2..2dcab8164b7715b6778f23cbd71787078155544d 100644 (file)
--- a/test/TEST-04-FULL-SYSTEMD/Makefile
+++ b/test/TEST-04-FULL-SYSTEMD/Makefile
@@ -1,10 +1 @@
-all:
-       @$(MAKE) -s --no-print-directory -C ../.. all
-       @V=$(V) basedir=../.. testdir=../ ./test.sh --all
-setup:
-       @$(MAKE) --no-print-directory -C ../.. all
-       @basedir=../.. testdir=../ ./test.sh --setup
-clean:
-       @basedir=../.. testdir=../ ./test.sh --clean
-run:
-       @basedir=../.. testdir=../ ./test.sh --run
+-include ../Makefile.testdir

diff --git a/test/TEST-10-RAID/Makefile b/test/TEST-10-RAID/Makefile
index aad27059472a34837e6b7b798ca092bb029b6df2..2dcab8164b7715b6778f23cbd71787078155544d 100644 (file)
--- a/test/TEST-10-RAID/Makefile
+++ b/test/TEST-10-RAID/Makefile
@@ -1,10 +1 @@
-all:
-       @$(MAKE) -s --no-print-directory -C ../.. all
-       @V=$(V) basedir=../.. testdir=../ ./test.sh --all
-setup:
-       @$(MAKE) --no-print-directory -C ../.. all
-       @basedir=../.. testdir=../ ./test.sh --setup
-clean:
-       @basedir=../.. testdir=../ ./test.sh --clean
-run:
-       @basedir=../.. testdir=../ ./test.sh --run
+-include ../Makefile.testdir

diff --git a/test/TEST-11-LVM/Makefile b/test/TEST-11-LVM/Makefile
index aad27059472a34837e6b7b798ca092bb029b6df2..2dcab8164b7715b6778f23cbd71787078155544d 100644 (file)
--- a/test/TEST-11-LVM/Makefile
+++ b/test/TEST-11-LVM/Makefile
@@ -1,10 +1 @@
-all:
-       @$(MAKE) -s --no-print-directory -C ../.. all
-       @V=$(V) basedir=../.. testdir=../ ./test.sh --all
-setup:
-       @$(MAKE) --no-print-directory -C ../.. all
-       @basedir=../.. testdir=../ ./test.sh --setup
-clean:
-       @basedir=../.. testdir=../ ./test.sh --clean
-run:
-       @basedir=../.. testdir=../ ./test.sh --run
+-include ../Makefile.testdir

diff --git a/test/TEST-12-RAID-DEG/Makefile b/test/TEST-12-RAID-DEG/Makefile
index aad27059472a34837e6b7b798ca092bb029b6df2..2dcab8164b7715b6778f23cbd71787078155544d 100644 (file)
--- a/test/TEST-12-RAID-DEG/Makefile
+++ b/test/TEST-12-RAID-DEG/Makefile
@@ -1,10 +1 @@
-all:
-       @$(MAKE) -s --no-print-directory -C ../.. all
-       @V=$(V) basedir=../.. testdir=../ ./test.sh --all
-setup:
-       @$(MAKE) --no-print-directory -C ../.. all
-       @basedir=../.. testdir=../ ./test.sh --setup
-clean:
-       @basedir=../.. testdir=../ ./test.sh --clean
-run:
-       @basedir=../.. testdir=../ ./test.sh --run
+-include ../Makefile.testdir

diff --git a/test/TEST-13-ENC-RAID-LVM/Makefile b/test/TEST-13-ENC-RAID-LVM/Makefile
index aad27059472a34837e6b7b798ca092bb029b6df2..2dcab8164b7715b6778f23cbd71787078155544d 100644 (file)
--- a/test/TEST-13-ENC-RAID-LVM/Makefile
+++ b/test/TEST-13-ENC-RAID-LVM/Makefile
@@ -1,10 +1 @@
-all:
-       @$(MAKE) -s --no-print-directory -C ../.. all
-       @V=$(V) basedir=../.. testdir=../ ./test.sh --all
-setup:
-       @$(MAKE) --no-print-directory -C ../.. all
-       @basedir=../.. testdir=../ ./test.sh --setup
-clean:
-       @basedir=../.. testdir=../ ./test.sh --clean
-run:
-       @basedir=../.. testdir=../ ./test.sh --run
+-include ../Makefile.testdir

diff --git a/test/TEST-14-IMSM/Makefile b/test/TEST-14-IMSM/Makefile
index bc0ddb615d875bd425239769c6e854f54e71c06b..2dcab8164b7715b6778f23cbd71787078155544d 100644 (file)
--- a/test/TEST-14-IMSM/Makefile
+++ b/test/TEST-14-IMSM/Makefile
@@ -1,10 +1 @@
-all:
-       @make -s --no-print-directory -C ../.. all
-       @basedir=../.. testdir=../ ./test.sh --all
-setup:
-       @make --no-print-directory -C ../.. all
-       @basedir=../.. testdir=../ ./test.sh --setup
-clean:
-       @basedir=../.. testdir=../ ./test.sh --clean
-run:
-       @basedir=../.. testdir=../ ./test.sh --run
+-include ../Makefile.testdir

diff --git a/test/TEST-15-BTRFSRAID/Makefile b/test/TEST-15-BTRFSRAID/Makefile
index aad27059472a34837e6b7b798ca092bb029b6df2..2dcab8164b7715b6778f23cbd71787078155544d 100644 (file)
--- a/test/TEST-15-BTRFSRAID/Makefile
+++ b/test/TEST-15-BTRFSRAID/Makefile
@@ -1,10 +1 @@
-all:
-       @$(MAKE) -s --no-print-directory -C ../.. all
-       @V=$(V) basedir=../.. testdir=../ ./test.sh --all
-setup:
-       @$(MAKE) --no-print-directory -C ../.. all
-       @basedir=../.. testdir=../ ./test.sh --setup
-clean:
-       @basedir=../.. testdir=../ ./test.sh --clean
-run:
-       @basedir=../.. testdir=../ ./test.sh --run
+-include ../Makefile.testdir

diff --git a/test/TEST-16-DMSQUASH/Makefile b/test/TEST-16-DMSQUASH/Makefile
index aad27059472a34837e6b7b798ca092bb029b6df2..2dcab8164b7715b6778f23cbd71787078155544d 100644 (file)
--- a/test/TEST-16-DMSQUASH/Makefile
+++ b/test/TEST-16-DMSQUASH/Makefile
@@ -1,10 +1 @@
-all:
-       @$(MAKE) -s --no-print-directory -C ../.. all
-       @V=$(V) basedir=../.. testdir=../ ./test.sh --all
-setup:
-       @$(MAKE) --no-print-directory -C ../.. all
-       @basedir=../.. testdir=../ ./test.sh --setup
-clean:
-       @basedir=../.. testdir=../ ./test.sh --clean
-run:
-       @basedir=../.. testdir=../ ./test.sh --run
+-include ../Makefile.testdir

diff --git a/test/TEST-17-LVM-THIN/Makefile b/test/TEST-17-LVM-THIN/Makefile
index aad27059472a34837e6b7b798ca092bb029b6df2..2dcab8164b7715b6778f23cbd71787078155544d 100644 (file)
--- a/test/TEST-17-LVM-THIN/Makefile
+++ b/test/TEST-17-LVM-THIN/Makefile
@@ -1,10 +1 @@
-all:
-       @$(MAKE) -s --no-print-directory -C ../.. all
-       @V=$(V) basedir=../.. testdir=../ ./test.sh --all
-setup:
-       @$(MAKE) --no-print-directory -C ../.. all
-       @basedir=../.. testdir=../ ./test.sh --setup
-clean:
-       @basedir=../.. testdir=../ ./test.sh --clean
-run:
-       @basedir=../.. testdir=../ ./test.sh --run
+-include ../Makefile.testdir

diff --git a/test/TEST-20-NFS/Makefile b/test/TEST-20-NFS/Makefile
index aad27059472a34837e6b7b798ca092bb029b6df2..2dcab8164b7715b6778f23cbd71787078155544d 100644 (file)
--- a/test/TEST-20-NFS/Makefile
+++ b/test/TEST-20-NFS/Makefile
@@ -1,10 +1 @@
-all:
-       @$(MAKE) -s --no-print-directory -C ../.. all
-       @V=$(V) basedir=../.. testdir=../ ./test.sh --all
-setup:
-       @$(MAKE) --no-print-directory -C ../.. all
-       @basedir=../.. testdir=../ ./test.sh --setup
-clean:
-       @basedir=../.. testdir=../ ./test.sh --clean
-run:
-       @basedir=../.. testdir=../ ./test.sh --run
+-include ../Makefile.testdir

diff --git a/test/TEST-30-ISCSI/Makefile b/test/TEST-30-ISCSI/Makefile
index aad27059472a34837e6b7b798ca092bb029b6df2..2dcab8164b7715b6778f23cbd71787078155544d 100644 (file)
--- a/test/TEST-30-ISCSI/Makefile
+++ b/test/TEST-30-ISCSI/Makefile
@@ -1,10 +1 @@
-all:
-       @$(MAKE) -s --no-print-directory -C ../.. all
-       @V=$(V) basedir=../.. testdir=../ ./test.sh --all
-setup:
-       @$(MAKE) --no-print-directory -C ../.. all
-       @basedir=../.. testdir=../ ./test.sh --setup
-clean:
-       @basedir=../.. testdir=../ ./test.sh --clean
-run:
-       @basedir=../.. testdir=../ ./test.sh --run
+-include ../Makefile.testdir

diff --git a/test/TEST-40-NBD/Makefile b/test/TEST-40-NBD/Makefile
index aad27059472a34837e6b7b798ca092bb029b6df2..2dcab8164b7715b6778f23cbd71787078155544d 100644 (file)
--- a/test/TEST-40-NBD/Makefile
+++ b/test/TEST-40-NBD/Makefile
@@ -1,10 +1 @@
-all:
-       @$(MAKE) -s --no-print-directory -C ../.. all
-       @V=$(V) basedir=../.. testdir=../ ./test.sh --all
-setup:
-       @$(MAKE) --no-print-directory -C ../.. all
-       @basedir=../.. testdir=../ ./test.sh --setup
-clean:
-       @basedir=../.. testdir=../ ./test.sh --clean
-run:
-       @basedir=../.. testdir=../ ./test.sh --run
+-include ../Makefile.testdir

diff --git a/test/TEST-50-MULTINIC/Makefile b/test/TEST-50-MULTINIC/Makefile
index aad27059472a34837e6b7b798ca092bb029b6df2..2dcab8164b7715b6778f23cbd71787078155544d 100644 (file)
--- a/test/TEST-50-MULTINIC/Makefile
+++ b/test/TEST-50-MULTINIC/Makefile
@@ -1,10 +1 @@
-all:
-       @$(MAKE) -s --no-print-directory -C ../.. all
-       @V=$(V) basedir=../.. testdir=../ ./test.sh --all
-setup:
-       @$(MAKE) --no-print-directory -C ../.. all
-       @basedir=../.. testdir=../ ./test.sh --setup
-clean:
-       @basedir=../.. testdir=../ ./test.sh --clean
-run:
-       @basedir=../.. testdir=../ ./test.sh --run
+-include ../Makefile.testdir

diff --git a/test/TEST-99-RPM/Makefile b/test/TEST-99-RPM/Makefile
index aad27059472a34837e6b7b798ca092bb029b6df2..2dcab8164b7715b6778f23cbd71787078155544d 100644 (file)
--- a/test/TEST-99-RPM/Makefile
+++ b/test/TEST-99-RPM/Makefile
@@ -1,10 +1 @@
-all:
-       @$(MAKE) -s --no-print-directory -C ../.. all
-       @V=$(V) basedir=../.. testdir=../ ./test.sh --all
-setup:
-       @$(MAKE) --no-print-directory -C ../.. all
-       @basedir=../.. testdir=../ ./test.sh --setup
-clean:
-       @basedir=../.. testdir=../ ./test.sh --clean
-run:
-       @basedir=../.. testdir=../ ./test.sh --run
+-include ../Makefile.testdir