From 3d710b0440a1dc4dfd4c7e4fb1875744304b08a4 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 15 Dec 2017 19:47:16 +0100
Subject: [PATCH 1/2] test: make sure "make" in the test directories works
 again

Fixes: #7648
---
 test/TEST-01-BASIC/Makefile         | 2 +-
 test/TEST-13-NSPAWN-SMOKE/Makefile  | 2 +-
 test/TEST-17-UDEV-WANTS/Makefile    | 2 +-
 test/TEST-18-FAILUREACTION/Makefile | 2 +-
 test/TEST-19-DELEGATE/Makefile      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/TEST-01-BASIC/Makefile b/test/TEST-01-BASIC/Makefile
index 3a212a07a9..34d7cc6cdf 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 ddcbbc302f..7d74b1343a 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 3a212a07a9..34d7cc6cdf 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 3a212a07a9..34d7cc6cdf 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 3a212a07a9..34d7cc6cdf 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 --$@

From c4b0c4599d1d6b0cea170fc04c1a79671d3c8419 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 15 Dec 2017 20:49:11 +0100
Subject: [PATCH 2/2] test: fix TEST-13-NSPAWN-SMOKE

We need to specify a full path to the "ip" binary and busybox "ip" has a
slightly different output than the normal ip, and won't show "DOWN".
hence instead ensure that at lest not "UP" is in there.
---
 test/TEST-13-NSPAWN-SMOKE/test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/TEST-13-NSPAWN-SMOKE/test.sh b/test/TEST-13-NSPAWN-SMOKE/test.sh
index 239c7e0731..6a0cb42eaf 100755
--- a/test/TEST-13-NSPAWN-SMOKE/test.sh
+++ b/test/TEST-13-NSPAWN-SMOKE/test.sh
@@ -147,7 +147,7 @@ function run {
     # test --network-namespace-path works with a network namespace created by "ip netns"
     ip netns add nspawn_test
     _netns_opt="--network-namespace-path=/run/netns/nspawn_test"
-    UNIFIED_CGROUP_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn --register=no -D "$_root" "$_netns_opt" ip a | grep -E '^1: lo.*DOWN'
+    UNIFIED_CGROUP_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn --register=no -D "$_root" "$_netns_opt" /bin/ip a | grep -v -E '^1: lo.*UP'
     local r=$?
     ip netns del nspawn_test