diff options
| author | Lars Hjemli | 2011-06-13 23:05:10 +0000 |
|---|---|---|
| committer | Lars Hjemli | 2011-06-13 23:05:10 +0000 |
| commit | 1b1bf635b59a349a9238a1d63a21d03d9949e185 (patch) | |
| tree | 78d1501781d72f0698f673e9c44450e32118d843 /tests | |
| parent | cgitrc.5.txt: reformat the "FILTER API" section (diff) | |
| parent | cgit.c: add 'clone-url' setting with support for macro expansion (diff) | |
| download | cgit-1b1bf635b59a349a9238a1d63a21d03d9949e185.tar.gz cgit-1b1bf635b59a349a9238a1d63a21d03d9949e185.zip | |
Merge branch 'lh/clone-url'
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/setup.sh | 1 | ||||
| -rwxr-xr-x | tests/t0102-summary.sh | 6 |
2 files changed, 7 insertions, 0 deletions
| diff --git a/tests/setup.sh b/tests/setup.sh index b2f1169..1e06107 100755 --- a/tests/setup.sh +++ b/tests/setup.sh | |||
| @@ -62,6 +62,7 @@ enable-log-linecount=1 | |||
| 62 | summary-log=5 | 62 | summary-log=5 |
| 63 | summary-branches=5 | 63 | summary-branches=5 |
| 64 | summary-tags=5 | 64 | summary-tags=5 |
| 65 | clone-url=git://example.org/\$CGIT_REPO_URL.git | ||
| 65 | 66 | ||
| 66 | repo.url=foo | 67 | repo.url=foo |
| 67 | repo.path=$PWD/trash/repos/foo/.git | 68 | repo.path=$PWD/trash/repos/foo/.git |
| diff --git a/tests/t0102-summary.sh b/tests/t0102-summary.sh index f0b0d9a..f299c5a 100755 --- a/tests/t0102-summary.sh +++ b/tests/t0102-summary.sh | |||
| @@ -9,6 +9,9 @@ run_test 'find commit 1' 'grep -e "commit 1" trash/tmp' | |||
| 9 | run_test 'find commit 5' 'grep -e "commit 5" trash/tmp' | 9 | run_test 'find commit 5' 'grep -e "commit 5" trash/tmp' |
| 10 | run_test 'find branch master' 'grep -e "master" trash/tmp' | 10 | run_test 'find branch master' 'grep -e "master" trash/tmp' |
| 11 | run_test 'no tags' '! grep -e "tags" trash/tmp' | 11 | run_test 'no tags' '! grep -e "tags" trash/tmp' |
| 12 | run_test 'clone-url expanded correctly' ' | ||
| 13 | grep -e "git://example.org/foo.git" trash/tmp | ||
| 14 | ' | ||
| 12 | 15 | ||
| 13 | run_test 'generate bar summary' 'cgit_url "bar" >trash/tmp' | 16 | run_test 'generate bar summary' 'cgit_url "bar" >trash/tmp' |
| 14 | run_test 'no commit 45' '! grep -e "commit 45" trash/tmp' | 17 | run_test 'no commit 45' '! grep -e "commit 45" trash/tmp' |
| @@ -16,5 +19,8 @@ run_test 'find commit 46' 'grep -e "commit 46" trash/tmp' | |||
| 16 | run_test 'find commit 50' 'grep -e "commit 50" trash/tmp' | 19 | run_test 'find commit 50' 'grep -e "commit 50" trash/tmp' |
| 17 | run_test 'find branch master' 'grep -e "master" trash/tmp' | 20 | run_test 'find branch master' 'grep -e "master" trash/tmp' |
| 18 | run_test 'no tags' '! grep -e "tags" trash/tmp' | 21 | run_test 'no tags' '! grep -e "tags" trash/tmp' |
| 22 | run_test 'clone-url expanded correctly' ' | ||
| 23 | grep -e "git://example.org/bar.git" trash/tmp | ||
| 24 | ' | ||
| 19 | 25 | ||
| 20 | tests_done | 26 | tests_done |