emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

drop svn complications from test runner

Browse Source 
Signed-off-by: Serge Hallyn <shallyn@cisco.com>
This commit is contained in:
Serge Hallyn 2020-04-24 16:41:34 -05:00 committed by Serge Hallyn
parent 316a153abb
commit 089cf55e2c
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/common/config.sh
View File

@ -8,7 +8,7 @@ build_path=$(git rev-parse --show-toplevel)
save_config () save_config ()
{ {
[ ! -d tmp ] && mkdir tmp [ ! -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 while read file
do do
mkdir -p "tmp/$(dirname "$file")" mkdir -p "tmp/$(dirname "$file")"
@ -19,7 +19,7 @@ save_config ()
# Copy the config files from config to the system # Copy the config files from config to the system
change_config () 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 while read file
do do
cp -f "config/$file" "/$file" cp -f "config/$file" "/$file"
@ -30,7 +30,7 @@ change_config ()
# The config files must be saved before with save_config (). # The config files must be saved before with save_config ().
restore_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 while read file
do do
if [ -f "tmp/$file" ]; then if [ -f "tmp/$file" ]; then
@ -54,7 +54,6 @@ prepare_chroot ()
{ {
mkdir tmp/root mkdir tmp/root
cp -rfdp config_chroot/* 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 lists=/root/tests/common/config_chroot.list
[ -f config_chroot.list ] && lists="$lists config_chroot.list" [ -f config_chroot.list ] && lists="$lists config_chroot.list"