summaryrefslogtreecommitdiff
path: root/GNUmakefile.in
diff options
context:
space:
mode:
authorDavid Kastrup <dak@gnu.org>2012-10-23 12:22:48 +0200
committerDavid Kastrup <dak@gnu.org>2012-10-26 07:00:41 +0200
commitbacfb43c79623bf26bd59187a6d8e7ea1b9557e2 (patch)
treed2ff0f1d99758431ebc03484fefe839e28a020c0 /GNUmakefile.in
parent66e8082e956551a38c9ea585a0593b89cb52dc59 (diff)
Issue 2920: Revert "Archive baselines in LILYPOND_BASELINES directory if specified"
This reverts commit 2ab98854c8f67c0edf5bc655a45aa6226e2caca9. It is likely that this code is no longer being used. This has been issue 2422 originally.
Diffstat (limited to 'GNUmakefile.in')
-rw-r--r--GNUmakefile.in29
1 files changed, 4 insertions, 25 deletions
diff --git a/GNUmakefile.in b/GNUmakefile.in
index ceeb410a61..74f2551393 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -307,32 +307,9 @@ test:
$(MAKE) -C input/regression/abc2ly out=test local-test
$(MAKE) -C input/regression/lilypond-book out=test local-test
-ifndef BASELINE_COMMIT
-BASELINE_COMMIT:=HEAD
-endif
-
-ifdef LILYPOND_BASELINES
-BASELINE_ARCHIVE:=$(LILYPOND_BASELINES)/baseline-$(shell git rev-list -1 $(BASELINE_COMMIT)).tar.gz
-
-test-baseline: $(BASELINE_ARCHIVE)
- tar xzf $(BASELINE_ARCHIVE)
- $(MAKE) test-snippets-clean
-
-$(BASELINE_ARCHIVE):
- $(MAKE) test-baseline-create
- tar czf $(BASELINE_ARCHIVE) input/regression/out-test-baseline \
- input/regression/midi/out-test-baseline \
- input/regression/musicxml/out-test-baseline \
- input/regression/abc2ly/out-test-baseline \
- input/regression/lilypond-book/out-test-baseline
-else
-test-baseline: test-baseline-create
- $(MAKE) test-snippets-clean
-endif
-
-test-baseline-create:
+test-baseline:
@if test -d .git ; then \
- $(if $(shell git diff $(BASELINE_COMMIT)), echo "commit before base lining" && false,true) ; \
+ $(if $(shell git diff), echo "commit before base lining" && false,true) ; \
fi
$(MAKE)
$(MAKE) test
@@ -341,6 +318,8 @@ test-baseline-create:
$(MAKE) out=test -C input/regression/musicxml local-test-baseline
$(MAKE) out=test -C input/regression/abc2ly local-test-baseline
$(MAKE) out=test -C input/regression/lilypond-book local-test-baseline
+ $(MAKE) test-snippets-clean
+
local-check: test
rm -rf $(RESULT_DIR)