diff options
author | John Keeping | 2013-03-04 21:58:50 +0000 |
---|---|---|
committer | Jason A. Donenfeld | 2013-03-04 19:39:07 -0500 |
commit | f9b801a1746d6c4476b230659d2e1f3714986550 (patch) | |
tree | 45db8777646083bb9bb8fd023169e6f88bd02caa | |
parent | tests: "grep -e" is not portable to all platforms (diff) | |
download | cgit-f9b801a1746d6c4476b230659d2e1f3714986550.tar.gz cgit-f9b801a1746d6c4476b230659d2e1f3714986550.zip |
tests: make whitespace consistent
Signed-off-by: John Keeping <john@keeping.me.uk>
-rwxr-xr-x | tests/t0105-commit.sh | 14 | ||||
-rwxr-xr-x | tests/t0107-snapshot.sh | 15 | ||||
-rwxr-xr-x | tests/t0108-patch.sh | 2 |
3 files changed, 17 insertions, 14 deletions
diff --git a/tests/t0105-commit.sh b/tests/t0105-commit.sh index 19a650b..31b554b 100755 --- a/tests/t0105-commit.sh +++ b/tests/t0105-commit.sh | |||
@@ -16,22 +16,22 @@ run_test 'find commit msg' 'grep "<div class=.commit-msg.></div>" trash/tmp' | |||
16 | run_test 'find diffstat' 'grep "<table summary=.diffstat. class=.diffstat.>" trash/tmp' | 16 | run_test 'find diffstat' 'grep "<table summary=.diffstat. class=.diffstat.>" trash/tmp' |
17 | 17 | ||
18 | run_test 'find diff summary' ' | 18 | run_test 'find diff summary' ' |
19 | grep "1 files changed, 1 insertions, 0 deletions" trash/tmp | 19 | grep "1 files changed, 1 insertions, 0 deletions" trash/tmp |
20 | ' | 20 | ' |
21 | 21 | ||
22 | run_test 'get root commit' ' | 22 | run_test 'get root commit' ' |
23 | root=$(cd trash/repos/foo && git rev-list --reverse HEAD | head -1) && | 23 | root=$(cd trash/repos/foo && git rev-list --reverse HEAD | head -1) && |
24 | cgit_url "foo/commit&id=$root" >trash/tmp && | 24 | cgit_url "foo/commit&id=$root" >trash/tmp && |
25 | grep "</html>" trash/tmp | 25 | grep "</html>" trash/tmp |
26 | ' | 26 | ' |
27 | 27 | ||
28 | run_test 'root commit contains diffstat' ' | 28 | run_test 'root commit contains diffstat' ' |
29 | grep "<a href=./foo/diff/file-1.id=[0-9a-f]\{40\}.>file-1</a>" trash/tmp | 29 | grep "<a href=./foo/diff/file-1.id=[0-9a-f]\{40\}.>file-1</a>" trash/tmp |
30 | ' | 30 | ' |
31 | 31 | ||
32 | run_test 'root commit contains diff' ' | 32 | run_test 'root commit contains diff' ' |
33 | grep ">diff --git a/file-1 b/file-1<" trash/tmp && | 33 | grep ">diff --git a/file-1 b/file-1<" trash/tmp && |
34 | grep "<div class=.add.>+1</div>" trash/tmp | 34 | grep "<div class=.add.>+1</div>" trash/tmp |
35 | ' | 35 | ' |
36 | 36 | ||
37 | tests_done | 37 | tests_done |
diff --git a/tests/t0107-snapshot.sh b/tests/t0107-snapshot.sh index 8ad9573..d23bf97 100755 --- a/tests/t0107-snapshot.sh +++ b/tests/t0107-snapshot.sh | |||
@@ -10,17 +10,20 @@ run_test 'get foo/snapshot/master.tar.gz' ' | |||
10 | 10 | ||
11 | run_test 'check html headers' ' | 11 | run_test 'check html headers' ' |
12 | head -n 1 trash/tmp | | 12 | head -n 1 trash/tmp | |
13 | grep "Content-Type: application/x-gzip" && | 13 | grep "Content-Type: application/x-gzip" && |
14 | 14 | ||
15 | head -n 2 trash/tmp | | 15 | head -n 2 trash/tmp | |
16 | grep "Content-Disposition: inline; filename=.master.tar.gz." | 16 | grep "Content-Disposition: inline; filename=.master.tar.gz." |
17 | ' | 17 | ' |
18 | 18 | ||
19 | run_test 'strip off the header lines' ' | 19 | run_test 'strip off the header lines' ' |
20 | tail -n +6 trash/tmp > trash/master.tar.gz | 20 | tail -n +6 trash/tmp > trash/master.tar.gz |
21 | ' | ||
22 | |||
23 | run_test ' | ||
24 | verify gzip format' 'gunzip --test trash/master.tar.gz | ||
21 | ' | 25 | ' |
22 | 26 | ||
23 | run_test 'verify gzip format' 'gunzip --test trash/master.tar.gz' | ||
24 | run_test 'untar' ' | 27 | run_test 'untar' ' |
25 | rm -rf trash/master && | 28 | rm -rf trash/master && |
26 | tar -xf trash/master.tar.gz -C trash | 29 | tar -xf trash/master.tar.gz -C trash |
@@ -32,8 +35,8 @@ run_test 'count files' ' | |||
32 | ' | 35 | ' |
33 | 36 | ||
34 | run_test 'verify untarred file-5' ' | 37 | run_test 'verify untarred file-5' ' |
35 | grep "^5$" trash/master/file-5 && | 38 | grep "^5$" trash/master/file-5 && |
36 | test $(cat trash/master/file-5 | wc -l) = 1 | 39 | test $(cat trash/master/file-5 | wc -l) = 1 |
37 | ' | 40 | ' |
38 | 41 | ||
39 | tests_done | 42 | tests_done |
diff --git a/tests/t0108-patch.sh b/tests/t0108-patch.sh index f15c893..f92f69c 100755 --- a/tests/t0108-patch.sh +++ b/tests/t0108-patch.sh | |||
@@ -21,7 +21,7 @@ run_test 'find `Subject:` line' ' | |||
21 | ' | 21 | ' |
22 | 22 | ||
23 | run_test 'find `cgit` signature' ' | 23 | run_test 'find `cgit` signature' ' |
24 | tail -1 trash/tmp | grep "^cgit" | 24 | tail -1 trash/tmp | grep "^cgit" |
25 | ' | 25 | ' |
26 | 26 | ||
27 | run_test 'find initial commit' ' | 27 | run_test 'find initial commit' ' |