diff options
Diffstat (limited to 'testsuite/runtest')
-rwxr-xr-x | testsuite/runtest | 34 |
1 files changed, 6 insertions, 28 deletions
diff --git a/testsuite/runtest b/testsuite/runtest index f57f464ee..89aba3985 100755 --- a/testsuite/runtest +++ b/testsuite/runtest | |||
@@ -2,37 +2,19 @@ | |||
2 | 2 | ||
3 | PATH=$(dirname $(pwd)):$PATH | 3 | PATH=$(dirname $(pwd)):$PATH |
4 | 4 | ||
5 | show_result () | ||
6 | { | ||
7 | local resolution=$1 | ||
8 | local testcase=$2 | ||
9 | local status=0 | ||
10 | |||
11 | if [ $resolution = XPASS -o $resolution = FAIL ]; then | ||
12 | status=1 | ||
13 | fi | ||
14 | |||
15 | if [ "$verbose" -o $status -eq 1 ]; then | ||
16 | echo "$resolution: $testcase" | ||
17 | fi | ||
18 | |||
19 | return $status | ||
20 | } | ||
21 | |||
22 | run_applet_testcase () | 5 | run_applet_testcase () |
23 | { | 6 | { |
24 | local applet=$1 | 7 | local applet=$1 |
25 | local testcase=$2 | 8 | local testcase=$2 |
26 | 9 | ||
27 | local status=0 | 10 | local status=0 |
28 | local X= | ||
29 | local RES= | 11 | local RES= |
30 | 12 | ||
31 | local uc_applet=$(echo $applet | tr a-z A-Z) | 13 | local uc_applet=$(echo $applet | tr a-z A-Z) |
32 | local testname=$(basename $testcase) | 14 | local testname=$(basename $testcase) |
33 | 15 | ||
34 | if grep -q "^# CONFIG_${uc_applet} is not set$" ../.config; then | 16 | if grep -q "^# CONFIG_${uc_applet} is not set$" ../.config; then |
35 | show_result UNTESTED $testname | 17 | echo UNTESTED: $testname |
36 | return 0 | 18 | return 0 |
37 | fi | 19 | fi |
38 | 20 | ||
@@ -40,15 +22,11 @@ run_applet_testcase () | |||
40 | local feature=`sed -ne 's/^# FEATURE: //p' $testcase` | 22 | local feature=`sed -ne 's/^# FEATURE: //p' $testcase` |
41 | 23 | ||
42 | if grep -q "^# ${feature} is not set$" ../.config; then | 24 | if grep -q "^# ${feature} is not set$" ../.config; then |
43 | show_result UNTESTED $testname | 25 | echo UNTESTED: $testname |
44 | return 0 | 26 | return 0 |
45 | fi | 27 | fi |
46 | fi | 28 | fi |
47 | 29 | ||
48 | if grep -q "^# XFAIL$" $testcase; then | ||
49 | X=X | ||
50 | fi | ||
51 | |||
52 | rm -rf tmp | 30 | rm -rf tmp |
53 | mkdir -p tmp | 31 | mkdir -p tmp |
54 | pushd tmp >/dev/null | 32 | pushd tmp >/dev/null |
@@ -56,14 +34,14 @@ run_applet_testcase () | |||
56 | sh -x -e ../$testcase >.logfile.txt 2>&1 | 34 | sh -x -e ../$testcase >.logfile.txt 2>&1 |
57 | 35 | ||
58 | if [ $? != 0 ] ; then | 36 | if [ $? != 0 ] ; then |
59 | show_result ${X}FAIL $testname | 37 | echo FAIL: $testname |
60 | if [ "$verbose" == 1 ]; then | 38 | if [ "$verbose" = 1 ]; then |
61 | cat .logfile.txt | 39 | cat .logfile.txt |
62 | exit 1; | 40 | #exit 1; |
63 | fi; | 41 | fi; |
64 | status=$? | 42 | status=$? |
65 | else | 43 | else |
66 | show_result ${X}PASS $testname | 44 | echo PASS: $testname |
67 | rm -f .logfile.txt | 45 | rm -f .logfile.txt |
68 | status=$? | 46 | status=$? |
69 | fi | 47 | fi |