summaryrefslogtreecommitdiffabout
path: root/tests
authorLars Hjemli <hjemli@gmail.com>2008-12-06 11:05:21 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-12-06 11:05:21 (UTC)
commit11456a60deab19f5e3a1d191bdf48adfba9195e4 (patch) (unidiff)
treed01ffde482a60e753bb32e6568c92c6b3e5a852b /tests
parent3c32fe07717f27fc891b66ccd06057fb810d03ad (diff)
parentb6faa78091a1340b73e291f1f87604f246d3f391 (diff)
downloadcgit-11456a60deab19f5e3a1d191bdf48adfba9195e4.zip
cgit-11456a60deab19f5e3a1d191bdf48adfba9195e4.tar.gz
cgit-11456a60deab19f5e3a1d191bdf48adfba9195e4.tar.bz2
Merge branch 'stable'
Diffstat (limited to 'tests') (more/less context) (ignore whitespace changes)
-rwxr-xr-xtests/setup.sh2
-rwxr-xr-xtests/t0010-validate-html.sh9
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
121cgit_query() 121cgit_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
126cgit_url() 126cgit_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
6test_url() 6test_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
24prepare_tests 'Validate html with tidy' 24prepare_tests 'Validate html with tidy'
25 25
26tidy=`which tidy`
27test -n "$tidy" || {
28 echo "Skipping tests: tidy not found"
29 tests_done
30 exit
31}
32
26run_test 'index page' 'test_url ""' 33run_test 'index page' 'test_url ""'
27run_test 'foo' 'test_url "foo"' 34run_test 'foo' 'test_url "foo"'
28run_test 'foo/log' 'test_url "foo/log"' 35run_test 'foo/log' 'test_url "foo/log"'
29run_test 'foo/tree' 'test_url "foo/tree"' 36run_test 'foo/tree' 'test_url "foo/tree"'
30run_test 'foo/tree/file-1' 'test_url "foo/tree/file-1"' 37run_test 'foo/tree/file-1' 'test_url "foo/tree/file-1"'
31run_test 'foo/commit' 'test_url "foo/commit"' 38run_test 'foo/commit' 'test_url "foo/commit"'
32run_test 'foo/diff' 'test_url "foo/diff"' 39run_test 'foo/diff' 'test_url "foo/diff"'
33 40
34tests_done 41tests_done