aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-05-02 09:19:29 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-05-02 09:19:29 +0000
commit57be4abcf845a9f61b8020a1a4c00abdd79c2d1e (patch)
treede88d3a49529f7051357f25f3f756ac6d8fb3b06
parente06122666841ab4a6fc3bbea7ca9a94686f2fd88 (diff)
downloadbusybox-57be4abcf845a9f61b8020a1a4c00abdd79c2d1e.tar.gz
busybox-57be4abcf845a9f61b8020a1a4c00abdd79c2d1e.tar.bz2
runtest: the saga continues :(
-rwxr-xr-xtestsuite/runtest37
1 files changed, 11 insertions, 26 deletions
diff --git a/testsuite/runtest b/testsuite/runtest
index 7e0c771e7..d9de8799f 100755
--- a/testsuite/runtest
+++ b/testsuite/runtest
@@ -62,18 +62,12 @@ run_oldstyle_applet_tests()
for testcase in "$tsdir/$applet"/*; do
# switch on basename of $testcase
case "${testcase##*/}" in
- \#*)
- continue
- ;;
- *\~)
- continue
- ;;
- "CVS")
- continue
- ;;
- .*)
- continue
- ;;
+ .*) continue ;; # .svn, .git etc
+ *~) continue ;; # backup files
+ "CVS") continue ;;
+ \#*) continue ;; # CVS merge residues
+ *.mine) continue ;; # svn-produced junk
+ *.r[0-9]*) continue ;; # svn-produced junk
esac
run_applet_testcase "$applet" "$testcase"
test $? -eq 0 || status=1
@@ -122,22 +116,13 @@ for i in $implemented; do
done
# Set up option flags so tests can be selective.
-export OPTIONFLAGS=:$(sed -nr 's/^CONFIG_//p' "$bindir/.config" | sed 's/=.*//' | xargs | sed 's/ /:/g')
+export OPTIONFLAGS=:$(
+ sed -nr 's/^CONFIG_//p' "$bindir/.config" |
+ sed 's/=.*//' | xargs | sed 's/ /:/g'
+ )
status=0
for applet in $applets; do
- case "$applet" in
- "links")
- continue
- ;;
- "CVS")
- continue
- ;;
- .*)
- continue
- ;;
- esac
-
# Any old-style tests for this applet?
if [ -d "$tsdir/$applet" ]; then
run_oldstyle_applet_tests "$applet"
@@ -162,7 +147,7 @@ done
# Leaving the dir makes it somewhat easier to run failed test by hand
#rm -rf "$LINKSDIR"
-if [ $status -ne 0 -a x"$VERBOSE" = x ]; then
+if [ $status -ne 0 ] && [ x"$VERBOSE" = x ]; then
echo "Failures detected, running with -v (verbose) will give more info"
fi
exit $status