From: Serge Hallyn <shallyn@cisco.com>
Date: Fri, 24 Apr 2020 21:41:34 +0000 (-0500)
Subject: drop svn complications from test runner
X-Git-Tag: v4.9~72^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=089cf55e2c35d2c3ae98b3a8adfe24019f8950e4;p=thirdparty%2Fshadow.git

drop svn complications from test runner

Signed-off-by: Serge Hallyn <shallyn@cisco.com>
---

diff --git a/tests/common/config.sh b/tests/common/config.sh
index b92436c5b..ea66ef3c6 100644
--- a/tests/common/config.sh
+++ b/tests/common/config.sh
@@ -8,7 +8,7 @@ build_path=$(git rev-parse --show-toplevel)
 save_config ()
 {
 	[ ! -d tmp ] && mkdir tmp
-	find config -depth -path "*/.svn/*" -prune -o -type f -print | sed -e 's/config\///' |
+	find config -depth -type f -print | sed -e 's/config\///' |
 	while read file
 	do
 		mkdir -p "tmp/$(dirname "$file")"
@@ -19,7 +19,7 @@ save_config ()
 # Copy the config files from config to the system
 change_config ()
 {
-	find config -depth -path "*/.svn/*" -prune -o -type f -print | sed -e 's/config\///' |
+	find config -depth -type f -print | sed -e 's/config\///' |
 	while read file
 	do
 		cp -f "config/$file" "/$file"
@@ -30,7 +30,7 @@ change_config ()
 # The config files must be saved before with save_config ().
 restore_config ()
 {
-	find config -depth -path "*/.svn/*" -prune -o -type f -print | sed -e 's/config\///' |
+	find config -depth -type f -print | sed -e 's/config\///' |
 	while read file
 	do
 		if [ -f "tmp/$file" ]; then
@@ -54,7 +54,6 @@ prepare_chroot ()
 {
 	mkdir tmp/root
 	cp -rfdp config_chroot/* tmp/root/
-	find tmp/root/ -name .svn -type d -print0 | xargs -0 rm -rf
 
 	lists=/root/tests/common/config_chroot.list
 	[ -f config_chroot.list ] && lists="$lists config_chroot.list"