author | Lars Hjemli <hjemli@gmail.com> | 2008-12-06 11:05:21 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-12-06 11:05:21 (UTC) |
commit | 11456a60deab19f5e3a1d191bdf48adfba9195e4 (patch) (unidiff) | |
tree | d01ffde482a60e753bb32e6568c92c6b3e5a852b | |
parent | 3c32fe07717f27fc891b66ccd06057fb810d03ad (diff) | |
parent | b6faa78091a1340b73e291f1f87604f246d3f391 (diff) | |
download | cgit-11456a60deab19f5e3a1d191bdf48adfba9195e4.zip cgit-11456a60deab19f5e3a1d191bdf48adfba9195e4.tar.gz cgit-11456a60deab19f5e3a1d191bdf48adfba9195e4.tar.bz2 |
Merge branch 'stable'
-rwxr-xr-x | tests/setup.sh | 2 | ||||
-rwxr-xr-x | tests/t0010-validate-html.sh | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/tests/setup.sh b/tests/setup.sh index 95acb54..30f90d5 100755 --- a/tests/setup.sh +++ b/tests/setup.sh | |||
@@ -104,25 +104,25 @@ run_test() | |||
104 | desc=$1 | 104 | desc=$1 |
105 | script=$2 | 105 | script=$2 |
106 | test_count=$(expr $test_count + 1) | 106 | test_count=$(expr $test_count + 1) |
107 | printf "\ntest %d: name='%s'\n" $test_count "$desc" >>test-output.log | 107 | printf "\ntest %d: name='%s'\n" $test_count "$desc" >>test-output.log |
108 | printf "test %d: eval='%s'\n" $test_count "$2" >>test-output.log | 108 | printf "test %d: eval='%s'\n" $test_count "$2" >>test-output.log |
109 | eval "$2" >>test-output.log 2>>test-output.log | 109 | eval "$2" >>test-output.log 2>>test-output.log |
110 | res=$? | 110 | res=$? |
111 | printf "test %d: exitcode=%d\n" $test_count $res >>test-output.log | 111 | printf "test %d: exitcode=%d\n" $test_count $res >>test-output.log |
112 | if test $res = 0 | 112 | if test $res = 0 |
113 | then | 113 | then |
114 | printf " %2d) %-60s [ok]\n" $test_count "$desc" | 114 | printf " %2d) %-60s [ok]\n" $test_count "$desc" |
115 | else | 115 | else |
116 | ((test_failed++)) | 116 | test_failed=$(expr $test_failed + 1) |
117 | printf " %2d) %-60s [failed]\n" $test_count "$desc" | 117 | printf " %2d) %-60s [failed]\n" $test_count "$desc" |
118 | fi | 118 | fi |
119 | } | 119 | } |
120 | 120 | ||
121 | cgit_query() | 121 | cgit_query() |
122 | { | 122 | { |
123 | CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="$1" "$PWD/../cgit" | 123 | CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="$1" "$PWD/../cgit" |
124 | } | 124 | } |
125 | 125 | ||
126 | cgit_url() | 126 | cgit_url() |
127 | { | 127 | { |
128 | CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit" | 128 | CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit" |
diff --git a/tests/t0010-validate-html.sh b/tests/t0010-validate-html.sh index 94aa52b..3fe4800 100755 --- a/tests/t0010-validate-html.sh +++ b/tests/t0010-validate-html.sh | |||
@@ -1,34 +1,41 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | . ./setup.sh | 3 | . ./setup.sh |
4 | 4 | ||
5 | 5 | ||
6 | test_url() | 6 | test_url() |
7 | { | 7 | { |
8 | tidy_opt="-eq" | 8 | tidy_opt="-eq" |
9 | test -z "$NO_TIDY_WARNINGS" || tidy_opt+=" --show-warnings no" | 9 | test -z "$NO_TIDY_WARNINGS" || tidy_opt+=" --show-warnings no" |
10 | cgit_url "$1" >trash/tidy-$test_count || return | 10 | cgit_url "$1" >trash/tidy-$test_count || return |
11 | sed -ie "1,4d" trash/tidy-$test_count || return | 11 | sed -ie "1,4d" trash/tidy-$test_count || return |
12 | tidy $tidy_opt trash/tidy-$test_count | 12 | "$tidy" $tidy_opt trash/tidy-$test_count |
13 | rc=$? | 13 | rc=$? |
14 | 14 | ||
15 | # tidy returns with exitcode 1 on warnings, 2 on error | 15 | # tidy returns with exitcode 1 on warnings, 2 on error |
16 | if test $rc = 2 | 16 | if test $rc = 2 |
17 | then | 17 | then |
18 | false | 18 | false |
19 | else | 19 | else |
20 | : | 20 | : |
21 | fi | 21 | fi |
22 | } | 22 | } |
23 | 23 | ||
24 | prepare_tests 'Validate html with tidy' | 24 | prepare_tests 'Validate html with tidy' |
25 | 25 | ||
26 | tidy=`which tidy` | ||
27 | test -n "$tidy" || { | ||
28 | echo "Skipping tests: tidy not found" | ||
29 | tests_done | ||
30 | exit | ||
31 | } | ||
32 | |||
26 | run_test 'index page' 'test_url ""' | 33 | run_test 'index page' 'test_url ""' |
27 | run_test 'foo' 'test_url "foo"' | 34 | run_test 'foo' 'test_url "foo"' |
28 | run_test 'foo/log' 'test_url "foo/log"' | 35 | run_test 'foo/log' 'test_url "foo/log"' |
29 | run_test 'foo/tree' 'test_url "foo/tree"' | 36 | run_test 'foo/tree' 'test_url "foo/tree"' |
30 | run_test 'foo/tree/file-1' 'test_url "foo/tree/file-1"' | 37 | run_test 'foo/tree/file-1' 'test_url "foo/tree/file-1"' |
31 | run_test 'foo/commit' 'test_url "foo/commit"' | 38 | run_test 'foo/commit' 'test_url "foo/commit"' |
32 | run_test 'foo/diff' 'test_url "foo/diff"' | 39 | run_test 'foo/diff' 'test_url "foo/diff"' |
33 | 40 | ||
34 | tests_done | 41 | tests_done |