From 71cb2d8940c874b4c8e8b4b876962fd380f223e1 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Fri, 3 Jan 2014 15:03:42 +0100
Subject: [PATCH] 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>
---
 tests/smoke-test     | 25 +++++++++++--------------
 tests/test-common.sh |  2 +-
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/tests/smoke-test b/tests/smoke-test
index f79a3b3d..f4717827 100755
--- 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
 
-need_update=
-for i in "$srcdir"/tests/smoke/[0-9]*
+t=
+for i in `git ls-files "$srcdir"/tests/smoke | grep 'tests/smoke/../..$'`
 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
@@ -44,16 +45,12 @@ reso * ?own#0
 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
diff --git a/tests/test-common.sh b/tests/test-common.sh
index 19d210d3..bc0d1a0f 100644
--- 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
-    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()