Make test generation generic.

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 30f82837a02765ae2a61986961271a4187ce90e7..b0c8d23b76b4e5e935bef1e5806f2c2ba3598cb0 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -18,7 +18,7 @@ documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation)
 
 SCRIPTS = configure autogen.sh 
 README_FILES = COPYING DEDICATION ROADMAP THANKS HACKING
-TOPDOC_FILES = AUTHORS README INSTALL NEWS
+TOPDOC_FILES = AUTHORS INSTALL README NEWS
 TOPDOC_TXT_FILES = $(addprefix $(top-build-dir)/Documentation/topdocs/$(outdir)/,$(addsuffix .txt,$(TOPDOC_FILES)))
 IN_FILES := $(call src-wildcard,*.in)
 
@@ -99,6 +99,7 @@ local-WWW-post:
        rm -rf $(outdir)/online-root
        rm -rf $(outdir)/offline-root
        $(PYTHON) $(buildscript-dir)/www_post.py $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(buildscript-dir) $(top-build-dir)/Documentation/po/$(outdir) $(outdir) "$(WEB_TARGETS)"
+       find $(outdir)/offline-root -type l -delete
 
 
 tree-prefix = $(outdir)
@@ -212,23 +213,14 @@ $(config_h): config.hh.in
 # testing
 
 RESULT_DIR=$(top-build-dir)/out/test-results
-OUT_TEST=test
 
 
 test:
-       rm -f input/regression/out-$(OUT_TEST)/collated-files.html
        @echo -en 'For tracking crashes: use\n\n\t'
        @echo 'grep sourcefilename `grep -L systems.texi input/regression/out-test/*log|sed s/log/ly/g`'
        @echo
-       if test -d .git  ; then \
-               echo -e 'HEAD is:\n\n\t' ; \
-               git log --max-count=1 --pretty=oneline ;\
-               echo -e '\n\n\n' ; \
-               git diff ; \
-       fi > input/regression/out-test/tree.gittxt
-       $(MAKE) -C input/regression/ out=$(OUT_TEST) LILYPOND_BOOK_LILYPOND_FLAGS="-dbackend=eps --formats=ps $(LILYPOND_JOBS) -dseparate-log-files -dinclude-eps-fonts -dgs-load-fonts --header=texidoc -I $(top-src-dir)/input/manual -ddump-profile -dcheck-internal-types -ddump-signatures -danti-alias-factor=1" LILYPOND_BOOK_VERBOSE= out-$(OUT_TEST)/collated-files.html
-       @find input ly -name '*.ly' -print |grep -v 'out.*/' | xargs grep '\\version' -L | grep -v "standard input" |sed 's/^/**** Missing version: /g' 
-       rsync -L -a--exclude 'out-*' --exclude 'out' --exclude mf --exclude source --exclude mf $(outdir)/share input/regression/out-test/
+       $(MAKE) -C input/regression/ out=test local-test
+       $(MAKE) -C input/regression/musicxml out=test local-test
 
 test-baseline: 
        @if  test -d .git ; then \
@@ -236,13 +228,14 @@ test-baseline:
        fi
        $(MAKE) 
        $(MAKE) test
-       rm -rf input/regression/out-test-baseline
-       mv input/regression/out-test input/regression/out-test-baseline
+       $(MAKE) -C input/regression/ local-test-baseline
+       $(MAKE) -C input/regression/musicxml local-test-baseline
 
 local-check: test
        rm -rf $(RESULT_DIR)
        mkdir -p $(RESULT_DIR)
        $(PYTHON) $(buildscript-dir)/output-distance.py --create-images --output-dir $(RESULT_DIR) input/regression/out-test-baseline input/regression/out-test/
+       @find input ly -name '*.ly' -print |grep -v 'out.*/' | xargs grep '\\version' -L | grep -v "standard input" |sed 's/^/**** Missing version: /g' 
 
 
 test-redo:
@@ -253,4 +246,4 @@ test-redo:
        $(MAKE) check
 
 test-clean:
-       $(MAKE) -C input/regression/ out=$(OUT_TEST) clean
+       $(MAKE) -C input/regression/ out=test clean