about summary refs log tree commit diff
path: root/tests/t0020-validate-cache.sh
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2013-04-01 15:09:05 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2013-04-08 22:27:11 +0200
commitc95cc5ec56dbb7394015eb18201403be6d80f69b (patch)
tree7014b96a1a1408b5291532c0c442082aba693a80 /tests/t0020-validate-cache.sh
parentDo not load user or system gitconfig and gitattributes (diff)
downloadcgit-pink-c95cc5ec56dbb7394015eb18201403be6d80f69b.tar.gz
cgit-pink-c95cc5ec56dbb7394015eb18201403be6d80f69b.zip
tests: use Git's test framework
This allows tests to run in parallel as well as letting us use "prove"
or another TAP harness to run the tests.

Git's test framework requires Git to be fully built before letting any
tests run, so add a new target to the top-level Makefile which builds
all of Git instead of just libgit.a and make the "test" target depend on
that.

Signed-off-by: John Keeping <john@keeping.me.uk>
Diffstat (limited to '')
-rwxr-xr-xtests/t0020-validate-cache.sh32
1 files changed, 17 insertions, 15 deletions
diff --git a/tests/t0020-validate-cache.sh b/tests/t0020-validate-cache.sh
index 53ec2eb..1910b47 100755
--- a/tests/t0020-validate-cache.sh
+++ b/tests/t0020-validate-cache.sh
@@ -1,13 +1,12 @@
 #!/bin/sh
 
+test_description='Validate cache'
 . ./setup.sh
 
-prepare_tests 'Validate cache'
+test_expect_success 'verify cache-size=0' '
 
-run_test 'verify cache-size=0' '
-
-	rm -f trash/cache/* &&
-	sed -i -e "s/cache-size=1021$/cache-size=0/" trash/cgitrc &&
+	rm -f cache/* &&
+	sed -i -e "s/cache-size=1021$/cache-size=0/" cgitrc &&
 	cgit_url "" &&
 	cgit_url "foo" &&
 	cgit_url "foo/refs" &&
@@ -21,13 +20,14 @@ run_test 'verify cache-size=0' '
 	cgit_url "bar/log" &&
 	cgit_url "bar/diff" &&
 	cgit_url "bar/patch" &&
-	test 0 -eq $(ls trash/cache | wc -l)
+	ls cache >output &&
+	test_line_count = 0 output
 '
 
-run_test 'verify cache-size=1' '
+test_expect_success 'verify cache-size=1' '
 
-	rm -f trash/cache/* &&
-	sed -i -e "s/cache-size=0$/cache-size=1/" trash/cgitrc &&
+	rm -f cache/* &&
+	sed -i -e "s/cache-size=0$/cache-size=1/" cgitrc &&
 	cgit_url "" &&
 	cgit_url "foo" &&
 	cgit_url "foo/refs" &&
@@ -41,13 +41,14 @@ run_test 'verify cache-size=1' '
 	cgit_url "bar/log" &&
 	cgit_url "bar/diff" &&
 	cgit_url "bar/patch" &&
-	test 1 -eq $(ls trash/cache | wc -l)
+	ls cache >output &&
+	test_line_count = 1 output
 '
 
-run_test 'verify cache-size=1021' '
+test_expect_success 'verify cache-size=1021' '
 
-	rm -f trash/cache/* &&
-	sed -i -e "s/cache-size=1$/cache-size=1021/" trash/cgitrc &&
+	rm -f cache/* &&
+	sed -i -e "s/cache-size=1$/cache-size=1021/" cgitrc &&
 	cgit_url "" &&
 	cgit_url "foo" &&
 	cgit_url "foo/refs" &&
@@ -61,7 +62,8 @@ run_test 'verify cache-size=1021' '
 	cgit_url "bar/log" &&
 	cgit_url "bar/diff" &&
 	cgit_url "bar/patch" &&
-	test 13 -eq $(ls trash/cache | wc -l)
+	ls cache >output &&
+	test_line_count = 13 output
 '
 
-tests_done
+test_done