From e6ba2c63c9ba3d8999bd2f1c5eac3c5bf7c14167 Mon Sep 17 00:00:00 2001
From: Carl Worth <cworth@cworth.org>
Date: Fri, 17 Sep 2010 12:10:54 -0700
Subject: test: Fix test suite to integrate with our non-recursive Makefile
 system.

This avoids "make test" emitting messages from three (3!) recursive
invocations of make. We change the invocations of the tests themselves
to occur directly from the shell script rather than having the shell
script invoke make again and using wildcards in the Makefile.
---
 test/notmuch-test | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

(limited to 'test/notmuch-test')

diff --git a/test/notmuch-test b/test/notmuch-test
index 5c066ed1..8ff21cc6 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -1,4 +1,23 @@
-#!/bin/bash
+#!/bin/sh
 
-cd $(dirname $0)
-make
+# Run tests
+#
+# Copyright (c) 2005 Junio C Hamano
+#
+# Adapted from a Makefile to a shell script by Carl Worth (2010)
+
+cd $(dirname "$0")
+
+# Clean up any results from a previous run
+rm -r test-results >/dev/null 2>/dev/null
+
+# Run the tests
+for test in t[0-9][0-9][0-9][0-9]*.sh; do
+	./"$test"
+done
+
+# Report results
+./aggregate-results.sh test-results/t*-*
+
+# Clean up
+rm -r test-results
-- 
cgit v1.2.3