empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tests: Avoid non-portable sed -i

Browse source 
Crept in in commit 7c3186f.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2015-03-03 20:45:03 +01:00
parent dc6cffa131
commit 7d249141be
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tests/test-common.sh
View file

@ -46,7 +46,7 @@ keep_journal 2
GODNEWS 0 GODNEWS 0
running_test_suite 1 running_test_suite 1
EOF EOF
cp `git ls-files "$srcdir"/src/lib/global | uniq | grep '\.config$'` sandbox/share/empire/builtin cp `perl "$srcdir"/src/scripts/ls-sources.pl "$srcdir"/src/lib/global '\.config$'` sandbox/share/empire/builtin
} }
copy_tables() copy_tables()
@ -58,6 +58,14 @@ copy_tables()
done done
} }
# sed -i isn't portable...
sed_i()
{
sed "$@" >sandbox/$$
shift $(($#-1))
mv sandbox/$$ "$1"
}
customize() customize()
{ {
local key local key
@ -66,7 +74,7 @@ customize()
case $key in case $key in
big-city) big-city)
copy_tables sect copy_tables sect
sed -i '/"c" .* norm/d;/^#.*"c" .* cana/s/^#/ /' sandbox/etc/empire/sect.config sed_i '/"c" .* norm/d;/^#.*"c" .* cana/s/^#/ /' sandbox/etc/empire/sect.config
;; ;;
esac esac
done done
@ -173,7 +181,7 @@ feed_files()
feed_dir() feed_dir()
{ {
feed_files `git ls-files "$@" | uniq | grep '/[0-9][0-9]-[^/]*$'` feed_files `perl "$srcdir"/src/scripts/ls-sources.pl "$@" '/[0-9][0-9]-[^/]*$'`
} }
begin_test() begin_test()