Replace Makefile with all.do

2 files changed, 29 insertions, 60 deletions

diff --git a/tests/Makefile b/tests/Makefile
deleted file mode 100644
index 93f4d89..0000000
--- a/tests/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-# Run tests
-#
-# Copyright (c) 2011-2012 Mathias Lafeldt
-# Copyright (c) 2005-2012 Git project
-# Copyright (c) 2005-2012 Junio C Hamano
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see http://www.gnu.org/licenses/ .
-
-SHELL_PATH ?= $(SHELL)
-SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
-RM ?= rm -f
-PROVE ?= prove
-AGGREGATE_SCRIPT ?= aggregate-results.sh
-DEFAULT_TEST_TARGET ?= test
-
-T = $(sort $(wildcard *.t))
-
-all: $(DEFAULT_TEST_TARGET)
-
-test: pre-clean
-	$(MAKE) aggregate-results-and-cleanup
-
-prove: pre-clean
-	@echo "*** prove ***"; $(PROVE) --exec '$(SHELL_PATH_SQ)' $(PROVE_OPTS) $(T) :: $(TEST_OPTS)
-	$(MAKE) clean-except-prove-cache
-
-$(T):
-	@echo "*** $@ ***"; '$(SHELL_PATH_SQ)' $@ $(TEST_OPTS)
-
-pre-clean:
-	$(RM) -r test-results
-
-clean-except-prove-cache:
-	$(RM) -r 'trash directory'.* test-results
-
-clean: clean-except-prove-cache
-	$(RM) .prove
-
-aggregate-results-and-cleanup: $(T)
-	$(MAKE) aggregate-results
-	$(MAKE) clean
-
-aggregate-results:
-	for f in test-results/*.counts; do \
-		echo "$$f"; \
-	done | '$(SHELL_PATH_SQ)' '$(AGGREGATE_SCRIPT)'
-
-.PHONY: all test prove $(T) pre-clean clean
-.PHONY: aggregate-results-and-cleanup aggregate-results
diff --git a/tests/all.do b/tests/all.do
new file mode 100644
index 0000000..9f63d1f
--- /dev/null
+++ b/tests/all.do
@@ -0,0 +1,29 @@
+#!/bin/sh -e
+# Copyright (c) 2015 Tharre
+#
+# This software may be modified and distributed under the terms
+# of the MIT license.  See the LICENSE file for details.
+
+# don't reuse existing redo session
+unset REDO_ROOT
+unset REDO_MAGIC
+unset REDO_PARENT_TARGET
+
+T=*.t
+
+# pre-clean
+rm -rf test-results
+
+# T
+for i in $T; do
+	echo "*** $i ***"
+	./$i
+done
+
+# aggregate-results
+for f in test-results/*.counts; do
+	echo "$f"
+done | ./aggregate-results.sh
+
+# cleanup
+rm -rf "trash directory.*" test-results .prove