tests: Use only files known to git
Filename expansion can pick up junk files. Use git-ls-files instead. Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
parent
bb467c335d
commit
71cb2d8940
2 changed files with 12 additions and 15 deletions
|
@ -29,11 +29,12 @@ begin_test "$srcdir"/tests/smoke/fairland.xdump
|
||||||
|
|
||||||
src/client/empire POGO peter <"$srcdir"/tests/smoke/newcap_script >/dev/null
|
src/client/empire POGO peter <"$srcdir"/tests/smoke/newcap_script >/dev/null
|
||||||
|
|
||||||
need_update=
|
t=
|
||||||
for i in "$srcdir"/tests/smoke/[0-9]*
|
for i in `git ls-files "$srcdir"/tests/smoke | grep 'tests/smoke/../..$'`
|
||||||
do
|
do
|
||||||
t="${i##*/}"
|
p="$t"
|
||||||
if [ "$need_update" ]
|
t="${i%/??}"
|
||||||
|
if [ "$p" != "$t" ] && [ "$p" ]
|
||||||
then
|
then
|
||||||
src/client/empire POGO peter <<EOF >/dev/null
|
src/client/empire POGO peter <<EOF >/dev/null
|
||||||
power new
|
power new
|
||||||
|
@ -44,16 +45,12 @@ reso * ?own#0
|
||||||
force
|
force
|
||||||
EOF
|
EOF
|
||||||
fi
|
fi
|
||||||
for j in "$i"/*
|
b="${i##*/}"
|
||||||
do
|
if [ $b -eq 0 ]
|
||||||
p="${j##*/}"
|
|
||||||
if [ $p -eq 0 ]
|
|
||||||
then c=POGO r=peter
|
then c=POGO r=peter
|
||||||
else c="${p#0}"; r="$c"
|
else c="${b#0}"; r="$c"
|
||||||
fi
|
fi
|
||||||
src/client/empire "$c" "$r" <$j >/dev/null
|
src/client/empire "$c" "$r" <"$i" >/dev/null
|
||||||
done
|
|
||||||
need_update=y
|
|
||||||
done
|
done
|
||||||
|
|
||||||
end_test
|
end_test
|
||||||
|
|
|
@ -20,7 +20,7 @@ builtin "../../share/empire/builtin"
|
||||||
listen_addr "$EMPIREHOST"
|
listen_addr "$EMPIREHOST"
|
||||||
keep_journal 2
|
keep_journal 2
|
||||||
EOF
|
EOF
|
||||||
cp "$srcdir"/src/lib/global/*.config sandbox/share/empire/builtin
|
cp `git ls-files "$srcdir"/src/lib/global | grep '\.config$'` sandbox/share/empire/builtin
|
||||||
}
|
}
|
||||||
|
|
||||||
now()
|
now()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue