author | Ramsay Jones <ramsay@ramsay1.demon.co.uk> | 2008-11-04 19:23:41 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-11-06 18:18:09 (UTC) |
commit | e4d2f2b042100182ff5b214fd6848b71d70fad7d (patch) (side-by-side diff) | |
tree | bb5bfcf6e5f71a478e7586bd1d128aa94bfd7dbe | |
parent | bdd4a56ad55720cde3b7b290b6b9fe4c57dc4f01 (diff) | |
download | cgit-e4d2f2b042100182ff5b214fd6848b71d70fad7d.zip cgit-e4d2f2b042100182ff5b214fd6848b71d70fad7d.tar.gz cgit-e4d2f2b042100182ff5b214fd6848b71d70fad7d.tar.bz2 |
Fix tests to work on Ubuntu (dash)
The system shell (/bin/sh) on Ubuntu is dash, which aims to be a
POSIX standard shell. In particular, dash does not implement any
of the common extensions to the standard that, say, bash and ksh
do.
Replace some non-POSIX constructs in setup.sh with more portable
and mundane code.
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rwxr-xr-x | tests/setup.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/setup.sh b/tests/setup.sh index 1457dd5..95acb54 100755 --- a/tests/setup.sh +++ b/tests/setup.sh @@ -16,29 +16,31 @@ # run_test 'repo summary' 'cgit_url "/foo" | tidy -e' mkrepo() { name=$1 count=$2 dir=$PWD test -d $name && return printf "Creating testrepo %s\n" $name mkdir -p $name cd $name git init - for ((n=1; n<=count; n++)) + n=1 + while test $n -le $count do echo $n >file-$n git add file-$n git commit -m "commit $n" + n=$(expr $n + 1) done if test "$3" = "testplus" then echo "hello" >a+b git add a+b git commit -m "add a+b" git branch "1+2" fi cd $dir } setup_repos() @@ -92,25 +94,25 @@ tests_done() if test $test_failed -gt 0 then printf "test: *** %s failure(s), logfile=%s\n" \ $test_failed "$(pwd)/test-output.log" false fi } run_test() { desc=$1 script=$2 - ((test_count++)) + test_count=$(expr $test_count + 1) printf "\ntest %d: name='%s'\n" $test_count "$desc" >>test-output.log printf "test %d: eval='%s'\n" $test_count "$2" >>test-output.log eval "$2" >>test-output.log 2>>test-output.log res=$? printf "test %d: exitcode=%d\n" $test_count $res >>test-output.log if test $res = 0 then printf " %2d) %-60s [ok]\n" $test_count "$desc" else ((test_failed++)) printf " %2d) %-60s [failed]\n" $test_count "$desc" fi |