From: Serge Hallyn <serge@hallyn.com>
Date: Sat, 25 Feb 2023 04:25:58 +0000 (-0600)
Subject: tests: remove some github runner PATH tweaking
X-Git-Tag: 4.14.0-rc1~145
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=421c6cf95160f55b0b4d4e2ab10de1579e99f956;p=thirdparty%2Fshadow.git

tests: remove some github runner PATH tweaking

It messes with the expected results.

We can do better than this in the expect scripts, but let's
get things running for now.

Signed-off-by: Serge Hallyn <serge@hallyn.com>
---

diff --git a/tests/common/config.sh b/tests/common/config.sh
index 664d1056a..9b3d37a6f 100644
--- a/tests/common/config.sh
+++ b/tests/common/config.sh
@@ -21,6 +21,13 @@ save_config ()
 		mkdir -p "tmp/$(dirname "$file")"
 		[ -f "/$file" ] && cp -dp "/$file" "tmp/$file" || true
 	done
+	# remove some things which can mess up PATH for some of our tests
+	# on github runners
+	mkdir -p "tmp/root"
+	cp -dp /root/.bashrc tmp/root/.bashrc
+	cp -dp /root/.profile tmp/root/.profile
+	sed -i '/pipx/d' /root/.bashrc /root/.profile
+	sed -i '/etc\/skel\/.cargo\/env/d' /root/.bashrc /root/.profile
 }
 
 # Copy the config files from config to the system