about summary refs log tree commit diff stats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rwxr-xr-xtests/setup.sh12
-rwxr-xr-xtests/t0001-validate-git-versions.sh4
-rwxr-xr-xtests/t0105-commit.sh2
-rwxr-xr-xtests/t0107-snapshot.sh17
-rwxr-xr-xtests/t0109-gitconfig.sh2
5 files changed, 19 insertions, 18 deletions
diff --git a/tests/setup.sh b/tests/setup.sh index 5879348..8db810f 100755 --- a/tests/setup.sh +++ b/tests/setup.sh
@@ -80,13 +80,17 @@ mkrepo() {
80 git commit -m "commit $n" 80 git commit -m "commit $n"
81 n=$(expr $n + 1) 81 n=$(expr $n + 1)
82 done 82 done
83 if test "$3" = "testplus" 83 case "$3" in
84 then 84 testplus)
85 echo "hello" >a+b 85 echo "hello" >a+b
86 git add a+b 86 git add a+b
87 git commit -m "add a+b" 87 git commit -m "add a+b"
88 git branch "1+2" 88 git branch "1+2"
89 fi 89 ;;
90 commit-graph)
91 git commit-graph write
92 ;;
93 esac
90 ) 94 )
91} 95}
92 96
@@ -95,7 +99,7 @@ setup_repos()
95 rm -rf cache 99 rm -rf cache
96 mkdir -p cache 100 mkdir -p cache
97 mkrepo repos/foo 5 >/dev/null 101 mkrepo repos/foo 5 >/dev/null
98 mkrepo repos/bar 50 >/dev/null 102 mkrepo repos/bar 50 commit-graph >/dev/null
99 mkrepo repos/foo+bar 10 testplus >/dev/null 103 mkrepo repos/foo+bar 10 testplus >/dev/null
100 mkrepo "repos/with space" 2 >/dev/null 104 mkrepo "repos/with space" 2 >/dev/null
101 mkrepo repos/filter 5 testplus >/dev/null 105 mkrepo repos/filter 5 testplus >/dev/null
diff --git a/tests/t0001-validate-git-versions.sh b/tests/t0001-validate-git-versions.sh index 73bd32f..dd84fe3 100755 --- a/tests/t0001-validate-git-versions.sh +++ b/tests/t0001-validate-git-versions.sh
@@ -33,10 +33,10 @@ test_expect_success 'test submodule version matches Makefile' '
33 else 33 else
34 ( 34 (
35 cd ../.. && 35 cd ../.. &&
36 sm_sha1=$(git ls-files --stage -- git | 36 sm_oid=$(git ls-files --stage -- git |
37 sed -e "s/^[0-9]* \\([0-9a-f]*\\) [0-9] .*$/\\1/") && 37 sed -e "s/^[0-9]* \\([0-9a-f]*\\) [0-9] .*$/\\1/") &&
38 cd git && 38 cd git &&
39 git describe --match "v[0-9]*" $sm_sha1 39 git describe --match "v[0-9]*" $sm_oid
40 ) | sed -e "s/^v//" -e "s/-/./" >sm_version && 40 ) | sed -e "s/^v//" -e "s/-/./" >sm_version &&
41 test_cmp sm_version makefile_version 41 test_cmp sm_version makefile_version
42 fi 42 fi
diff --git a/tests/t0105-commit.sh b/tests/t0105-commit.sh index d5ff96c..cfed1e7 100755 --- a/tests/t0105-commit.sh +++ b/tests/t0105-commit.sh
@@ -25,7 +25,7 @@ test_expect_success 'get root commit' '
25' 25'
26 26
27test_expect_success 'root commit contains diffstat' ' 27test_expect_success 'root commit contains diffstat' '
28 grep "<a href=./foo/diff/file-1.id=[0-9a-f]\{40\}.>file-1</a>" tmp 28 grep "<a href=./foo/diff/file-1.id=[0-9a-f]\{40,64\}.>file-1</a>" tmp
29' 29'
30 30
31test_expect_success 'root commit contains diff' ' 31test_expect_success 'root commit contains diff' '
diff --git a/tests/t0107-snapshot.sh b/tests/t0107-snapshot.sh index c164d3e..0811ec4 100755 --- a/tests/t0107-snapshot.sh +++ b/tests/t0107-snapshot.sh
@@ -25,7 +25,7 @@ test_expect_success 'verify gzip format' '
25 25
26test_expect_success 'untar' ' 26test_expect_success 'untar' '
27 rm -rf master && 27 rm -rf master &&
28 tar -xzf master.tar.gz 28 gzip -dc master.tar.gz | tar -xf -
29' 29'
30 30
31test_expect_success 'count files' ' 31test_expect_success 'count files' '
@@ -61,13 +61,12 @@ test_expect_success LZIP 'strip off the header lines' '
61' 61'
62 62
63test_expect_success LZIP 'verify lzip format' ' 63test_expect_success LZIP 'verify lzip format' '
64 lzip --test master.tar.lz && 64 lzip --test master.tar.lz
65 cp master.tar.lz /tmp/.
66' 65'
67 66
68test_expect_success LZIP 'untar' ' 67test_expect_success LZIP 'untar' '
69 rm -rf master && 68 rm -rf master &&
70 tar --lzip -xf master.tar.lz 69 lzip -dc master.tar.lz | tar -xf -
71' 70'
72 71
73test_expect_success LZIP 'count files' ' 72test_expect_success LZIP 'count files' '
@@ -103,13 +102,12 @@ test_expect_success XZ 'strip off the header lines' '
103' 102'
104 103
105test_expect_success XZ 'verify xz format' ' 104test_expect_success XZ 'verify xz format' '
106 xz --test master.tar.xz && 105 xz --test master.tar.xz
107 cp master.tar.xz /tmp/.
108' 106'
109 107
110test_expect_success XZ 'untar' ' 108test_expect_success XZ 'untar' '
111 rm -rf master && 109 rm -rf master &&
112 tar --xz -xf master.tar.xz 110 xz -dc master.tar.xz | tar -xf -
113' 111'
114 112
115test_expect_success XZ 'count files' ' 113test_expect_success XZ 'count files' '
@@ -145,13 +143,12 @@ test_expect_success ZSTD 'strip off the header lines' '
145' 143'
146 144
147test_expect_success ZSTD 'verify zstd format' ' 145test_expect_success ZSTD 'verify zstd format' '
148 zstd --test master.tar.zst && 146 zstd --test master.tar.zst
149 cp master.tar.zst /tmp/.
150' 147'
151 148
152test_expect_success ZSTD 'untar' ' 149test_expect_success ZSTD 'untar' '
153 rm -rf master && 150 rm -rf master &&
154 tar --zstd -xf master.tar.zst 151 zstd -dc master.tar.zst | tar -xf -
155' 152'
156 153
157test_expect_success ZSTD 'count files' ' 154test_expect_success ZSTD 'count files' '
diff --git a/tests/t0109-gitconfig.sh b/tests/t0109-gitconfig.sh index 8cee75c..189ef28 100755 --- a/tests/t0109-gitconfig.sh +++ b/tests/t0109-gitconfig.sh
@@ -25,7 +25,7 @@ test_no_home_access () {
25 -E CGIT_CONFIG="$PWD/cgitrc" \ 25 -E CGIT_CONFIG="$PWD/cgitrc" \
26 -E QUERY_STRING="url=$1" \ 26 -E QUERY_STRING="url=$1" \
27 -e access -f -o strace.out cgit && 27 -e access -f -o strace.out cgit &&
28 test_must_fail grep "$non_existent_path" strace.out 28 ! grep "$non_existent_path" strace.out
29} 29}
30 30
31test_no_home_access_success() { 31test_no_home_access_success() {