about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRamsay Jones <ramsay@ramsay1.demon.co.uk>2008-11-04 19:23:41 +0000
committerLars Hjemli <hjemli@gmail.com>2008-11-06 19:18:09 +0100
commite4d2f2b042100182ff5b214fd6848b71d70fad7d (patch)
treebb5bfcf6e5f71a478e7586bd1d128aa94bfd7dbe
parentFix some warnings to allow -Werror (diff)
downloadcgit-pink-e4d2f2b042100182ff5b214fd6848b71d70fad7d.tar.gz
cgit-pink-e4d2f2b042100182ff5b214fd6848b71d70fad7d.zip
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-xtests/setup.sh6
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
@@ -25,11 +25,13 @@ mkrepo() {
 	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
@@ -101,7 +103,7 @@ 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