From c95cc5ec56dbb7394015eb18201403be6d80f69b Mon Sep 17 00:00:00 2001
From: John Keeping
Date: Mon, 1 Apr 2013 15:09:05 +0100
Subject: 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>
---
 tests/t0108-patch.sh | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

(limited to 'tests/t0108-patch.sh')

diff --git a/tests/t0108-patch.sh b/tests/t0108-patch.sh
index f92f69c..3b5bae4 100755
--- a/tests/t0108-patch.sh
+++ b/tests/t0108-patch.sh
@@ -1,39 +1,38 @@
 #!/bin/sh
 
+test_description='Check content on patch page'
 . ./setup.sh
 
-prepare_tests "Check content on patch page"
-
-run_test 'generate foo/patch' '
-	cgit_query "url=foo/patch" >trash/tmp
+test_expect_success 'generate foo/patch' '
+	cgit_query "url=foo/patch" >tmp
 '
 
-run_test 'find `From:` line' '
-	grep "^From: " trash/tmp
+test_expect_success 'find `From:` line' '
+	grep "^From: " tmp
 '
 
-run_test 'find `Date:` line' '
-	grep "^Date: " trash/tmp
+test_expect_success 'find `Date:` line' '
+	grep "^Date: " tmp
 '
 
-run_test 'find `Subject:` line' '
-	grep "^Subject: commit 5" trash/tmp
+test_expect_success 'find `Subject:` line' '
+	grep "^Subject: commit 5" tmp
 '
 
-run_test 'find `cgit` signature' '
-	tail -1 trash/tmp | grep "^cgit"
+test_expect_success 'find `cgit` signature' '
+	tail -1 tmp | grep "^cgit"
 '
 
-run_test 'find initial commit' '
-	root=$(git --git-dir="$PWD/trash/repos/foo/.git" rev-list HEAD | tail -1)
+test_expect_success 'find initial commit' '
+	root=$(git --git-dir="$PWD/repos/foo/.git" rev-list HEAD | tail -1)
 '
 
-run_test 'generate patch for initial commit' '
-	cgit_query "url=foo/patch&id=$root" >trash/tmp
+test_expect_success 'generate patch for initial commit' '
+	cgit_query "url=foo/patch&id=$root" >tmp
 '
 
-run_test 'find `cgit` signature' '
-	tail -1 trash/tmp | grep "^cgit"
+test_expect_success 'find `cgit` signature' '
+	tail -1 tmp | grep "^cgit"
 '
 
-tests_done
+test_done
-- 
cgit v1.2.3-70-g09d2