From 70964ccb35ad5f04ee86ee8f5f8aa3b3bf85b798 Mon Sep 17 00:00:00 2001
From: Jacques de Laval <jacques@de-laval.se>
Date: Wed, 24 Feb 2021 23:28:47 +0100
Subject: [PATCH] test: Only mess with PATH inside test environment

---
 test/setup-root.sh    | 4 ++--
 test/testenv_enter.sh | 3 +++
 test/testenv_exec.sh  | 3 +++
 test/testenv_start.sh | 3 +++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/test/setup-root.sh b/test/setup-root.sh
index 7f9ead5a..bc88fe0d 100755
--- a/test/setup-root.sh
+++ b/test/setup-root.sh
@@ -14,12 +14,12 @@ if [ ! -f "$srcdir"/../config.status ]; then
     cp "${srcdir}/test-root/Makefile" test-root/
     make -C test-root/
     config_h='./config.h'
-    echo "export PATH=/bin:/sbin" > test.env
+    echo "export TESTENV_PATH=/bin:/sbin" > test.env
 else
     make -C ../ DESTDIR="$(pwd)/test-root/" install
     FINITBIN=../../src/finit make -C test-root/
     config_h='../config.h'
-    echo "export PATH=/bin:/sbin:$PREFIX/sbin:$PREFIX/bin" > test.env
+    echo "export TESTENV_PATH=/bin:/sbin:$PREFIX/sbin:$PREFIX/bin" > test.env
 fi
 
 echo "export FINIT_CONF=$(grep FINIT_CONF $config_h | cut -d' ' -f3 | cut -d'"' -f2)" >> test.env
diff --git a/test/testenv_enter.sh b/test/testenv_enter.sh
index 8a04fa43..ef385481 100755
--- a/test/testenv_enter.sh
+++ b/test/testenv_enter.sh
@@ -20,4 +20,7 @@ else
     exit 1
 fi
 
+PATH="$TESTENV_PATH"
+export PATH
+
 "$(dirname "$0")"/testenv_exec.sh "$target" "$cmd" "$@"
diff --git a/test/testenv_exec.sh b/test/testenv_exec.sh
index bb2494e1..aa0aafda 100755
--- a/test/testenv_exec.sh
+++ b/test/testenv_exec.sh
@@ -21,6 +21,9 @@ export PS2='> '
 export PS3='#? '
 export PS4='+ '
 
+PATH="$TESTENV_PATH"
+export PATH
+
 "$nsenter" \
     --preserve-credentials \
     --user \
diff --git a/test/testenv_start.sh b/test/testenv_start.sh
index fb384027..cd1ea7c7 100755
--- a/test/testenv_start.sh
+++ b/test/testenv_start.sh
@@ -13,6 +13,9 @@ export PS2='> '
 export PS3='#? '
 export PS4='+ '
 
+PATH="$TESTENV_PATH"
+export PATH
+
 # Not supported by Busybox unshare:
 #  --cgroup --time
 exec "$unshare" \