On multiprocessor machines, or with I/O heavy tests (that leave the
CPU waiting a lot), it makes sense to parallelize the tests.
However, care has to be taken that the different jobs use different
trash directories.
This commit does so, by inspecting the MAKEFLAGS variable to detect
if the option "-j" or "--jobs" was passed to make. In that case, the
test is run with the new "--parallel" option.
If parallel mode was detected, the trash directories are created with
a suffix that is unique with regard to the test, as it is the test's
base name.
Parallel mode also triggers removal of the trash directory in the test
itself if everything went fine, so that the trash directories do not
pile up only to be removed at the very end.
If a test failed, the trash directory is not removed. Chances are
that the exact error message is lost in the clutter, but you can still
see what test failed from the name of the trash directory, and repeat
the test (without -j).
If all was good, you will see the aggregated results.
Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
---
t/Makefile | 8 ++++++--
t/test-lib.sh | 11 ++++++++++-
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/t/Makefile b/t/Makefile
index aa952e1..fb2fba9 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -14,6 +14,11 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
TSVN = $(wildcard t91[0-9][0-9]-*.sh)
+# MAKEFLAGS only sees the -j flag when expanded in the task, so we cannot
+# use ifeq() games here. Instead we play shell games.
+GIT_TEST_OPTS += $(shell echo " $(MAKEFLAGS)" | \
+ sed -n "s/^.* \(--jobs\|\(-\|[^-]*\)j\).*/--parallel/p")
+
all: pre-clean
$(MAKE) aggregate-results-and-cleanup
@@ -24,7 +29,7 @@ pre-clean:
$(RM) -r test-results
clean:
- $(RM) -r 'trash directory' test-results
+ $(RM) -rf 'trash directory' test-results
aggregate-results-and-cleanup: $(T)
$(MAKE) aggregate-results
@@ -39,4 +44,3 @@ full-svn-test:
$(MAKE) $(TSVN) GIT_SVN_NO_OPTIMIZE_COMMITS=0 LC_ALL=en_US.UTF-8
.PHONY: pre-clean $(T) aggregate-results clean
-.NOTPARALLEL:
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 11c0275..c5868c4 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -74,6 +74,7 @@ esac
) &&
color=t
+test="trash directory"
while test "$#" -ne 0
do
case "$1" in
@@ -94,6 +95,10 @@ do
--no-python)
# noop now...
shift ;;
+ --parallel)
+ test="$test.$(basename "$0" .sh)"
+ remove_trash="$(pwd)/$test"
+ shift ;;
*)
break ;;
esac
@@ -449,6 +454,11 @@ test_done () {
# we will leave things as they are.
say_color pass "passed all $msg"
+
+ test ! -z = "$remove_trash" &&
+ cd "$(dirname "$remove_trash")" &&
+ rm -rf "$(basename "$remove_trash")"
+
exit 0 ;;
*)
@@ -485,7 +495,6 @@ fi
. ../GIT-BUILD-OPTIONS
# Test repository
-test="trash directory"
rm -fr "$test" || {
trap - exit
echo >&5 "FATAL: Cannot prepare test area"
--
1.6.0.rc2.23.gd08e9
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
