summaryrefslogtreecommitdiffabout
path: root/tests
authorRamsay 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)
commite4d2f2b042100182ff5b214fd6848b71d70fad7d (patch) (unidiff)
treebb5bfcf6e5f71a478e7586bd1d128aa94bfd7dbe /tests
parentbdd4a56ad55720cde3b7b290b6b9fe4c57dc4f01 (diff)
downloadcgit-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>
Diffstat (limited to 'tests') (more/less context) (show whitespace changes)
-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() {
25 mkdir -p $name 25 mkdir -p $name
26 cd $name 26 cd $name
27 git init 27 git init
28 for ((n=1; n<=count; n++)) 28 n=1
29 while test $n -le $count
29 do 30 do
30 echo $n >file-$n 31 echo $n >file-$n
31 git add file-$n 32 git add file-$n
32 git commit -m "commit $n" 33 git commit -m "commit $n"
34 n=$(expr $n + 1)
33 done 35 done
34 if test "$3" = "testplus" 36 if test "$3" = "testplus"
35 then 37 then
@@ -101,7 +103,7 @@ run_test()
101{ 103{
102 desc=$1 104 desc=$1
103 script=$2 105 script=$2
104 ((test_count++)) 106 test_count=$(expr $test_count + 1)
105 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
106 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
107 eval "$2" >>test-output.log 2>>test-output.log 109 eval "$2" >>test-output.log 2>>test-output.log