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>

diff --git a/tests/smoke-test b/tests/smoke-test
index f79a3b3d7e9d32b196ff295fda36b930b1d7f71a..f4717827aaedd500707516e9e2ddf389d7697d7f 100755 (executable)
--- a/tests/smoke-test
+++ b/tests/smoke-test
@@ -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=
-for i in "$srcdir"/tests/smoke/[0-9]*
+t=
+for i in `git ls-files "$srcdir"/tests/smoke | grep 'tests/smoke/../..$'`

 do
 do

-    t="${i##*/}"
-    if [ "$need_update" ]
+    p="$t"
+    t="${i%/??}"
+    if [ "$p" != "$t" ] && [ "$p" ]

     then
        src/client/empire POGO peter <<EOF >/dev/null
 power new
     then
        src/client/empire POGO peter <<EOF >/dev/null
 power new


@@ -44,16 +45,12 @@ reso * ?own#0
 force
 EOF
     fi
 force
 EOF
     fi

-    for j in "$i"/*
-    do
-       p="${j##*/}"
-       if [ $p -eq 0 ]
-       then c=POGO r=peter
-       else c="${p#0}"; r="$c"
-       fi
-       src/client/empire "$c" "$r" <$j >/dev/null
-    done
-    need_update=y
+    b="${i##*/}"
+    if [ $b -eq 0 ]
+    then c=POGO r=peter
+    else c="${b#0}"; r="$c"
+    fi
+    src/client/empire "$c" "$r" <"$i" >/dev/null

 done
 
 end_test
 done
 
 end_test

diff --git a/tests/test-common.sh b/tests/test-common.sh
index 19d210d3bd841499f166b6c0da3177ba8f1335fa..bc0d1a0f9db855c4b77468f7ff3e09ca6c164f00 100644 (file)
--- a/tests/test-common.sh
+++ b/tests/test-common.sh
@@ -20,7 +20,7 @@ builtin "../../share/empire/builtin"
 listen_addr "$EMPIREHOST"
 keep_journal 2
 EOF
 listen_addr "$EMPIREHOST"
 keep_journal 2
 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()