* [PATCH 1/3] tests: "grep -e" is not portable to all platforms
@ 2013-03-04 21:58 john
2013-03-04 21:58 ` [PATCH 2/3] tests: make whitespace consistent john
2013-03-04 21:58 ` [PATCH 3/3] t0107-snapshot: add tests for ZIP archives john
0 siblings, 2 replies; 4+ messages in thread
From: john @ 2013-03-04 21:58 UTC (permalink / raw)
The "-e" option to grep is not needed unless specifying more than one
pattern, which we don't do. Remove it to avoid restricting the tests on
platforms that do not have a grep that recognises "-e".
Signed-off-by: John Keeping <john at keeping.me.uk>
---
tests/t0101-index.sh | 18 +++++++++---------
tests/t0102-summary.sh | 22 +++++++++++-----------
tests/t0103-log.sh | 20 ++++++++++----------
tests/t0104-tree.sh | 12 ++++++------
tests/t0105-commit.sh | 12 ++++++------
tests/t0106-diff.sh | 10 +++++-----
tests/t0107-snapshot.sh | 6 +++---
tests/t0108-patch.sh | 10 +++++-----
8 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/tests/t0101-index.sh b/tests/t0101-index.sh
index 573a351..ab63aca 100755
--- a/tests/t0101-index.sh
+++ b/tests/t0101-index.sh
@@ -5,14 +5,14 @@
prepare_tests "Check content on index page"
run_test 'generate index page' 'cgit_url "" >trash/tmp'
-run_test 'find foo repo' 'grep -e "foo" trash/tmp'
-run_test 'find foo description' 'grep -e "\[no description\]" trash/tmp'
-run_test 'find bar repo' 'grep -e "bar" trash/tmp'
-run_test 'find bar description' 'grep -e "the bar repo" trash/tmp'
-run_test 'find foo+bar repo' 'grep -e ">foo+bar<" trash/tmp'
-run_test 'verify foo+bar link' 'grep -e "/foo+bar/" trash/tmp'
-run_test 'verify "with%20space" link' 'grep -e "/with%20space/" trash/tmp'
-run_test 'no tree-link' '! grep -e "foo/tree" trash/tmp'
-run_test 'no log-link' '! grep -e "foo/log" trash/tmp'
+run_test 'find foo repo' 'grep "foo" trash/tmp'
+run_test 'find foo description' 'grep "\[no description\]" trash/tmp'
+run_test 'find bar repo' 'grep "bar" trash/tmp'
+run_test 'find bar description' 'grep "the bar repo" trash/tmp'
+run_test 'find foo+bar repo' 'grep ">foo+bar<" trash/tmp'
+run_test 'verify foo+bar link' 'grep "/foo+bar/" trash/tmp'
+run_test 'verify "with%20space" link' 'grep "/with%20space/" trash/tmp'
+run_test 'no tree-link' '! grep "foo/tree" trash/tmp'
+run_test 'no log-link' '! grep "foo/log" trash/tmp'
tests_done
diff --git a/tests/t0102-summary.sh b/tests/t0102-summary.sh
index f299c5a..f778cb4 100755
--- a/tests/t0102-summary.sh
+++ b/tests/t0102-summary.sh
@@ -5,22 +5,22 @@
prepare_tests "Check content on summary page"
run_test 'generate foo summary' 'cgit_url "foo" >trash/tmp'
-run_test 'find commit 1' 'grep -e "commit 1" trash/tmp'
-run_test 'find commit 5' 'grep -e "commit 5" trash/tmp'
-run_test 'find branch master' 'grep -e "master" trash/tmp'
-run_test 'no tags' '! grep -e "tags" trash/tmp'
+run_test 'find commit 1' 'grep "commit 1" trash/tmp'
+run_test 'find commit 5' 'grep "commit 5" trash/tmp'
+run_test 'find branch master' 'grep "master" trash/tmp'
+run_test 'no tags' '! grep "tags" trash/tmp'
run_test 'clone-url expanded correctly' '
- grep -e "git://example.org/foo.git" trash/tmp
+ grep "git://example.org/foo.git" trash/tmp
'
run_test 'generate bar summary' 'cgit_url "bar" >trash/tmp'
-run_test 'no commit 45' '! grep -e "commit 45" trash/tmp'
-run_test 'find commit 46' 'grep -e "commit 46" trash/tmp'
-run_test 'find commit 50' 'grep -e "commit 50" trash/tmp'
-run_test 'find branch master' 'grep -e "master" trash/tmp'
-run_test 'no tags' '! grep -e "tags" trash/tmp'
+run_test 'no commit 45' '! grep "commit 45" trash/tmp'
+run_test 'find commit 46' 'grep "commit 46" trash/tmp'
+run_test 'find commit 50' 'grep "commit 50" trash/tmp'
+run_test 'find branch master' 'grep "master" trash/tmp'
+run_test 'no tags' '! grep "tags" trash/tmp'
run_test 'clone-url expanded correctly' '
- grep -e "git://example.org/bar.git" trash/tmp
+ grep "git://example.org/bar.git" trash/tmp
'
tests_done
diff --git a/tests/t0103-log.sh b/tests/t0103-log.sh
index 7fa6754..67fcba0 100755
--- a/tests/t0103-log.sh
+++ b/tests/t0103-log.sh
@@ -5,21 +5,21 @@
prepare_tests "Check content on log page"
run_test 'generate foo/log' 'cgit_url "foo/log" >trash/tmp'
-run_test 'find commit 1' 'grep -e "commit 1" trash/tmp'
-run_test 'find commit 5' 'grep -e "commit 5" trash/tmp'
+run_test 'find commit 1' 'grep "commit 1" trash/tmp'
+run_test 'find commit 5' 'grep "commit 5" trash/tmp'
run_test 'generate bar/log' 'cgit_url "bar/log" >trash/tmp'
-run_test 'find commit 1' 'grep -e "commit 1" trash/tmp'
-run_test 'find commit 50' 'grep -e "commit 50" trash/tmp'
+run_test 'find commit 1' 'grep "commit 1" trash/tmp'
+run_test 'find commit 50' 'grep "commit 50" trash/tmp'
run_test 'generate "with%20space/log?qt=grep&q=commit+1"' '
cgit_url "with+space/log&qt=grep&q=commit+1" >trash/tmp
'
-run_test 'find commit 1' 'grep -e "commit 1" trash/tmp'
-run_test 'find link with %20 in path' 'grep -e "/with%20space/log/?qt=grep" trash/tmp'
-run_test 'find link with + in arg' 'grep -e "/log/?qt=grep&q=commit+1" trash/tmp'
-run_test 'no links with space in path' '! grep -e "href=./with space/" trash/tmp'
-run_test 'no links with space in arg' '! grep -e "q=commit 1" trash/tmp'
-run_test 'commit 2 is not visible' '! grep -e "commit 2" trash/tmp'
+run_test 'find commit 1' 'grep "commit 1" trash/tmp'
+run_test 'find link with %20 in path' 'grep "/with%20space/log/?qt=grep" trash/tmp'
+run_test 'find link with + in arg' 'grep "/log/?qt=grep&q=commit+1" trash/tmp'
+run_test 'no links with space in path' '! grep "href=./with space/" trash/tmp'
+run_test 'no links with space in arg' '! grep "q=commit 1" trash/tmp'
+run_test 'commit 2 is not visible' '! grep "commit 2" trash/tmp'
tests_done
diff --git a/tests/t0104-tree.sh b/tests/t0104-tree.sh
index 2ce1251..7aa3b8d 100755
--- a/tests/t0104-tree.sh
+++ b/tests/t0104-tree.sh
@@ -5,29 +5,29 @@
prepare_tests "Check content on tree page"
run_test 'generate bar/tree' 'cgit_url "bar/tree" >trash/tmp'
-run_test 'find file-1' 'grep -e "file-1" trash/tmp'
-run_test 'find file-50' 'grep -e "file-50" trash/tmp'
+run_test 'find file-1' 'grep "file-1" trash/tmp'
+run_test 'find file-50' 'grep "file-50" trash/tmp'
run_test 'generate bar/tree/file-50' 'cgit_url "bar/tree/file-50" >trash/tmp'
run_test 'find line 1' '
- grep -e "<a class=.no. id=.n1. name=.n1. href=.#n1.>1</a>" trash/tmp
+ grep "<a class=.no. id=.n1. name=.n1. href=.#n1.>1</a>" trash/tmp
'
run_test 'no line 2' '
- ! grep -e "<a class=.no. id=.n2. name=.n2. href=.#n2.>2</a>" trash/tmp
+ ! grep "<a class=.no. id=.n2. name=.n2. href=.#n2.>2</a>" trash/tmp
'
run_test 'generate foo+bar/tree' 'cgit_url "foo%2bbar/tree" >trash/tmp'
run_test 'verify a+b link' '
- grep -e "/foo+bar/tree/a+b" trash/tmp
+ grep "/foo+bar/tree/a+b" trash/tmp
'
run_test 'generate foo+bar/tree?h=1+2' 'cgit_url "foo%2bbar/tree&h=1%2b2" >trash/tmp'
run_test 'verify a+b?h=1+2 link' '
- grep -e "/foo+bar/tree/a+b?h=1%2b2" trash/tmp
+ grep "/foo+bar/tree/a+b?h=1%2b2" trash/tmp
'
tests_done
diff --git a/tests/t0105-commit.sh b/tests/t0105-commit.sh
index ae794c8..19a650b 100755
--- a/tests/t0105-commit.sh
+++ b/tests/t0105-commit.sh
@@ -5,18 +5,18 @@
prepare_tests "Check content on commit page"
run_test 'generate foo/commit' 'cgit_url "foo/commit" >trash/tmp'
-run_test 'find tree link' 'grep -e "<a href=./foo/tree/.>" trash/tmp'
+run_test 'find tree link' 'grep "<a href=./foo/tree/.>" trash/tmp'
run_test 'find parent link' 'grep -E "<a href=./foo/commit/\?id=.+>" trash/tmp'
run_test 'find commit subject' '
- grep -e "<div class=.commit-subject.>commit 5<" trash/tmp
+ grep "<div class=.commit-subject.>commit 5<" trash/tmp
'
-run_test 'find commit msg' 'grep -e "<div class=.commit-msg.></div>" trash/tmp'
-run_test 'find diffstat' 'grep -e "<table summary=.diffstat. class=.diffstat.>" trash/tmp'
+run_test 'find commit msg' 'grep "<div class=.commit-msg.></div>" trash/tmp'
+run_test 'find diffstat' 'grep "<table summary=.diffstat. class=.diffstat.>" trash/tmp'
run_test 'find diff summary' '
- grep -e "1 files changed, 1 insertions, 0 deletions" trash/tmp
+ grep "1 files changed, 1 insertions, 0 deletions" trash/tmp
'
run_test 'get root commit' '
@@ -31,7 +31,7 @@ run_test 'root commit contains diffstat' '
run_test 'root commit contains diff' '
grep ">diff --git a/file-1 b/file-1<" trash/tmp &&
- grep -e "<div class=.add.>+1</div>" trash/tmp
+ grep "<div class=.add.>+1</div>" trash/tmp
'
tests_done
diff --git a/tests/t0106-diff.sh b/tests/t0106-diff.sh
index e140bcc..eee0c8c 100755
--- a/tests/t0106-diff.sh
+++ b/tests/t0106-diff.sh
@@ -5,16 +5,16 @@
prepare_tests "Check content on diff page"
run_test 'generate foo/diff' 'cgit_url "foo/diff" >trash/tmp'
-run_test 'find diff header' 'grep -e "a/file-5 b/file-5" trash/tmp'
-run_test 'find blob link' 'grep -e "<a href=./foo/tree/file-5?id=" trash/tmp'
-run_test 'find added file' 'grep -e "new file mode 100644" trash/tmp'
+run_test 'find diff header' 'grep "a/file-5 b/file-5" trash/tmp'
+run_test 'find blob link' 'grep "<a href=./foo/tree/file-5?id=" trash/tmp'
+run_test 'find added file' 'grep "new file mode 100644" trash/tmp'
run_test 'find hunk header' '
- grep -e "<div class=.hunk.>@@ -0,0 +1 @@</div>" trash/tmp
+ grep "<div class=.hunk.>@@ -0,0 +1 @@</div>" trash/tmp
'
run_test 'find added line' '
- grep -e "<div class=.add.>+5</div>" trash/tmp
+ grep "<div class=.add.>+5</div>" trash/tmp
'
tests_done
diff --git a/tests/t0107-snapshot.sh b/tests/t0107-snapshot.sh
index 8ab4912..8ad9573 100755
--- a/tests/t0107-snapshot.sh
+++ b/tests/t0107-snapshot.sh
@@ -10,10 +10,10 @@ run_test 'get foo/snapshot/master.tar.gz' '
run_test 'check html headers' '
head -n 1 trash/tmp |
- grep -e "Content-Type: application/x-gzip" &&
+ grep "Content-Type: application/x-gzip" &&
head -n 2 trash/tmp |
- grep -e "Content-Disposition: inline; filename=.master.tar.gz."
+ grep "Content-Disposition: inline; filename=.master.tar.gz."
'
run_test 'strip off the header lines' '
@@ -32,7 +32,7 @@ run_test 'count files' '
'
run_test 'verify untarred file-5' '
- grep -e "^5$" trash/master/file-5 &&
+ grep "^5$" trash/master/file-5 &&
test $(cat trash/master/file-5 | wc -l) = 1
'
diff --git a/tests/t0108-patch.sh b/tests/t0108-patch.sh
index 6ee70b3..f15c893 100755
--- a/tests/t0108-patch.sh
+++ b/tests/t0108-patch.sh
@@ -9,19 +9,19 @@ run_test 'generate foo/patch' '
'
run_test 'find `From:` line' '
- grep -e "^From: " trash/tmp
+ grep "^From: " trash/tmp
'
run_test 'find `Date:` line' '
- grep -e "^Date: " trash/tmp
+ grep "^Date: " trash/tmp
'
run_test 'find `Subject:` line' '
- grep -e "^Subject: commit 5" trash/tmp
+ grep "^Subject: commit 5" trash/tmp
'
run_test 'find `cgit` signature' '
- tail -1 trash/tmp | grep -e "^cgit"
+ tail -1 trash/tmp | grep "^cgit"
'
run_test 'find initial commit' '
@@ -33,7 +33,7 @@ run_test 'generate patch for initial commit' '
'
run_test 'find `cgit` signature' '
- tail -1 trash/tmp | grep -e "^cgit"
+ tail -1 trash/tmp | grep "^cgit"
'
tests_done
--
1.8.2.rc1.339.g93ec2c9
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/3] tests: make whitespace consistent
2013-03-04 21:58 [PATCH 1/3] tests: "grep -e" is not portable to all platforms john
@ 2013-03-04 21:58 ` john
2013-03-04 21:58 ` [PATCH 3/3] t0107-snapshot: add tests for ZIP archives john
1 sibling, 0 replies; 4+ messages in thread
From: john @ 2013-03-04 21:58 UTC (permalink / raw)
Signed-off-by: John Keeping <john at keeping.me.uk>
---
tests/t0105-commit.sh | 14 +++++++-------
tests/t0107-snapshot.sh | 15 +++++++++------
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'
run_test 'find diffstat' 'grep "<table summary=.diffstat. class=.diffstat.>" trash/tmp'
run_test 'find diff summary' '
- grep "1 files changed, 1 insertions, 0 deletions" trash/tmp
+ grep "1 files changed, 1 insertions, 0 deletions" trash/tmp
'
run_test 'get root commit' '
- root=$(cd trash/repos/foo && git rev-list --reverse HEAD | head -1) &&
- cgit_url "foo/commit&id=$root" >trash/tmp &&
- grep "</html>" trash/tmp
+ root=$(cd trash/repos/foo && git rev-list --reverse HEAD | head -1) &&
+ cgit_url "foo/commit&id=$root" >trash/tmp &&
+ grep "</html>" trash/tmp
'
run_test 'root commit contains diffstat' '
- grep "<a href=./foo/diff/file-1.id=[0-9a-f]\{40\}.>file-1</a>" trash/tmp
+ grep "<a href=./foo/diff/file-1.id=[0-9a-f]\{40\}.>file-1</a>" trash/tmp
'
run_test 'root commit contains diff' '
- grep ">diff --git a/file-1 b/file-1<" trash/tmp &&
- grep "<div class=.add.>+1</div>" trash/tmp
+ grep ">diff --git a/file-1 b/file-1<" trash/tmp &&
+ grep "<div class=.add.>+1</div>" trash/tmp
'
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' '
run_test 'check html headers' '
head -n 1 trash/tmp |
- grep "Content-Type: application/x-gzip" &&
+ grep "Content-Type: application/x-gzip" &&
head -n 2 trash/tmp |
- grep "Content-Disposition: inline; filename=.master.tar.gz."
+ grep "Content-Disposition: inline; filename=.master.tar.gz."
'
run_test 'strip off the header lines' '
- tail -n +6 trash/tmp > trash/master.tar.gz
+ tail -n +6 trash/tmp > trash/master.tar.gz
+'
+
+run_test '
+ verify gzip format' 'gunzip --test trash/master.tar.gz
'
-run_test 'verify gzip format' 'gunzip --test trash/master.tar.gz'
run_test 'untar' '
rm -rf trash/master &&
tar -xf trash/master.tar.gz -C trash
@@ -32,8 +35,8 @@ run_test 'count files' '
'
run_test 'verify untarred file-5' '
- grep "^5$" trash/master/file-5 &&
- test $(cat trash/master/file-5 | wc -l) = 1
+ grep "^5$" trash/master/file-5 &&
+ test $(cat trash/master/file-5 | wc -l) = 1
'
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' '
'
run_test 'find `cgit` signature' '
- tail -1 trash/tmp | grep "^cgit"
+ tail -1 trash/tmp | grep "^cgit"
'
run_test 'find initial commit' '
--
1.8.2.rc1.339.g93ec2c9
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 3/3] t0107-snapshot: add tests for ZIP archives
2013-03-04 21:58 [PATCH 1/3] tests: "grep -e" is not portable to all platforms john
2013-03-04 21:58 ` [PATCH 2/3] tests: make whitespace consistent john
@ 2013-03-04 21:58 ` john
2013-03-05 0:42 ` Jason
1 sibling, 1 reply; 4+ messages in thread
From: john @ 2013-03-04 21:58 UTC (permalink / raw)
Signed-off-by: John Keeping <john at keeping.me.uk>
---
tests/t0107-snapshot.sh | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/tests/t0107-snapshot.sh b/tests/t0107-snapshot.sh
index d23bf97..22a1385 100755
--- a/tests/t0107-snapshot.sh
+++ b/tests/t0107-snapshot.sh
@@ -39,4 +39,39 @@ run_test 'verify untarred file-5' '
test $(cat trash/master/file-5 | wc -l) = 1
'
+run_test 'get foo/snapshot/master.zip' '
+ cgit_url "foo/snapshot/master.zip" >trash/tmp
+'
+
+run_test 'check HTML headers (zip)' '
+ head -n 1 trash/tmp |
+ grep "Content-Type: application/x-zip" &&
+
+ head -n 2 trash/tmp |
+ grep "Content-Disposition: inline; filename=.master.zip."
+'
+
+run_test 'strip off the header lines (zip)' '
+ tail -n +6 trash/tmp >trash/master.zip
+'
+
+run_test 'verify zip format' '
+ unzip -t trash/master.zip
+'
+
+run_test 'unzip' '
+ rm -rf trash/master &&
+ unzip trash/master.zip -d trash
+'
+
+run_test 'count files (zip)' '
+ c=$(ls -1 trash/master/ | wc -l) &&
+ test $c = 5
+'
+
+run_test 'verify unzipped file-5' '
+ grep "^5$" trash/master/file-5 &&
+ test $(cat trash/master/file-5 | wc -l) = 1
+'
+
tests_done
--
1.8.2.rc1.339.g93ec2c9
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 3/3] t0107-snapshot: add tests for ZIP archives
2013-03-04 21:58 ` [PATCH 3/3] t0107-snapshot: add tests for ZIP archives john
@ 2013-03-05 0:42 ` Jason
0 siblings, 0 replies; 4+ messages in thread
From: Jason @ 2013-03-05 0:42 UTC (permalink / raw)
Merged 1 - 3. Thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-03-05 0:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-04 21:58 [PATCH 1/3] tests: "grep -e" is not portable to all platforms john
2013-03-04 21:58 ` [PATCH 2/3] tests: make whitespace consistent john
2013-03-04 21:58 ` [PATCH 3/3] t0107-snapshot: add tests for ZIP archives john
2013-03-05 0:42 ` Jason
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).