summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2017-12-15 19:47:16 +0100
committerLennart Poettering <lennart@poettering.net>2017-12-15 19:48:08 +0100
commit3d710b0440a1dc4dfd4c7e4fb1875744304b08a4 (patch)
tree6fa6c3c9430abcdbdb0966aaba4b21d15a1ff4f3 /test
parentFix logical error in meson.build (#7658) (diff)
downloadsystemd-3d710b0440a1dc4dfd4c7e4fb1875744304b08a4.tar.xz
systemd-3d710b0440a1dc4dfd4c7e4fb1875744304b08a4.zip
test: make sure "make" in the test directories works again
Fixes: #7648
Diffstat (limited to 'test')
-rw-r--r--test/TEST-01-BASIC/Makefile2
-rw-r--r--test/TEST-13-NSPAWN-SMOKE/Makefile2
-rw-r--r--test/TEST-17-UDEV-WANTS/Makefile2
-rw-r--r--test/TEST-18-FAILUREACTION/Makefile2
-rw-r--r--test/TEST-19-DELEGATE/Makefile2
5 files changed, 5 insertions, 5 deletions
diff --git a/test/TEST-01-BASIC/Makefile b/test/TEST-01-BASIC/Makefile
index 3a212a07a91..34d7cc6cdf7 100644
--- a/test/TEST-01-BASIC/Makefile
+++ b/test/TEST-01-BASIC/Makefile
@@ -1,4 +1,4 @@
-BUILD_DIR=$(exec ../../tools/find-build-dir.sh)
+BUILD_DIR=$(shell ../../tools/find-build-dir.sh)
all setup clean run:
@basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@
diff --git a/test/TEST-13-NSPAWN-SMOKE/Makefile b/test/TEST-13-NSPAWN-SMOKE/Makefile
index ddcbbc302fa..7d74b1343a6 100644
--- a/test/TEST-13-NSPAWN-SMOKE/Makefile
+++ b/test/TEST-13-NSPAWN-SMOKE/Makefile
@@ -1,4 +1,4 @@
-BUILD_DIR=$(exec ../../tools/find-build-dir.sh)
+BUILD_DIR=$(shell ../../tools/find-build-dir.sh)
all setup run:
@basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@
diff --git a/test/TEST-17-UDEV-WANTS/Makefile b/test/TEST-17-UDEV-WANTS/Makefile
index 3a212a07a91..34d7cc6cdf7 100644
--- a/test/TEST-17-UDEV-WANTS/Makefile
+++ b/test/TEST-17-UDEV-WANTS/Makefile
@@ -1,4 +1,4 @@
-BUILD_DIR=$(exec ../../tools/find-build-dir.sh)
+BUILD_DIR=$(shell ../../tools/find-build-dir.sh)
all setup clean run:
@basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@
diff --git a/test/TEST-18-FAILUREACTION/Makefile b/test/TEST-18-FAILUREACTION/Makefile
index 3a212a07a91..34d7cc6cdf7 100644
--- a/test/TEST-18-FAILUREACTION/Makefile
+++ b/test/TEST-18-FAILUREACTION/Makefile
@@ -1,4 +1,4 @@
-BUILD_DIR=$(exec ../../tools/find-build-dir.sh)
+BUILD_DIR=$(shell ../../tools/find-build-dir.sh)
all setup clean run:
@basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@
diff --git a/test/TEST-19-DELEGATE/Makefile b/test/TEST-19-DELEGATE/Makefile
index 3a212a07a91..34d7cc6cdf7 100644
--- a/test/TEST-19-DELEGATE/Makefile
+++ b/test/TEST-19-DELEGATE/Makefile
@@ -1,4 +1,4 @@
-BUILD_DIR=$(exec ../../tools/find-build-dir.sh)
+BUILD_DIR=$(shell ../../tools/find-build-dir.sh)
all setup clean run:
@basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@