diff options
author | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2004-04-06 00:41:39 +0000 |
---|---|---|
committer | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2004-04-06 00:41:39 +0000 |
commit | 74b8f42d7bdcf30afe626c18b5443b27a8e03d44 (patch) | |
tree | 34b5ee3d1a8c5aa2377aff28d83d7657d9820aa3 | |
parent | f361526224b4cb27784f3423f2212e8671b9fd22 (diff) | |
download | busybox-w32-74b8f42d7bdcf30afe626c18b5443b27a8e03d44.tar.gz busybox-w32-74b8f42d7bdcf30afe626c18b5443b27a8e03d44.tar.bz2 busybox-w32-74b8f42d7bdcf30afe626c18b5443b27a8e03d44.zip |
Fix the test suite script so it actually works and actually flags
all errors as such. Make verbose mode exit on FAIL and provide a
printout of the failed test run.
git-svn-id: svn://busybox.net/trunk/busybox@8690 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rwxr-xr-x | testsuite/runtest | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/testsuite/runtest b/testsuite/runtest index 2cf85f5d8..f57f464ee 100755 --- a/testsuite/runtest +++ b/testsuite/runtest | |||
@@ -26,6 +26,7 @@ run_applet_testcase () | |||
26 | 26 | ||
27 | local status=0 | 27 | local status=0 |
28 | local X= | 28 | local X= |
29 | local RES= | ||
29 | 30 | ||
30 | local uc_applet=$(echo $applet | tr a-z A-Z) | 31 | local uc_applet=$(echo $applet | tr a-z A-Z) |
31 | local testname=$(basename $testcase) | 32 | local testname=$(basename $testcase) |
@@ -48,14 +49,22 @@ run_applet_testcase () | |||
48 | X=X | 49 | X=X |
49 | fi | 50 | fi |
50 | 51 | ||
51 | mkdir tmp | 52 | rm -rf tmp |
53 | mkdir -p tmp | ||
52 | pushd tmp >/dev/null | 54 | pushd tmp >/dev/null |
53 | 55 | ||
54 | if . ../$testcase >/dev/null 2>&1; then | 56 | sh -x -e ../$testcase >.logfile.txt 2>&1 |
55 | show_result ${X}PASS $testname | 57 | |
58 | if [ $? != 0 ] ; then | ||
59 | show_result ${X}FAIL $testname | ||
60 | if [ "$verbose" == 1 ]; then | ||
61 | cat .logfile.txt | ||
62 | exit 1; | ||
63 | fi; | ||
56 | status=$? | 64 | status=$? |
57 | else | 65 | else |
58 | show_result ${X}FAIL $testname | 66 | show_result ${X}PASS $testname |
67 | rm -f .logfile.txt | ||
59 | status=$? | 68 | status=$? |
60 | fi | 69 | fi |
61 | 70 | ||