build test for coverage in separate dir.

diff --git a/GNUmakefile.in b/GNUmakefile.in
index d72b7a6c00ce4b87a6d1a0fa4f23962f5c15a47c..d8b725b7e1403f401d796163c9501fd4a70fb2c2 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -205,15 +205,21 @@ $(config_h): config.hh.in
        @false
 
 
+################################################################
+# testing
+
+RESULT_DIR=$(top-build-dir)/out/test-results
+OUT_TEST=test
+
 
 test:
        rm -f input/regression/out-test/collated-files.html
-       $(MAKE) -C input/regression/ out=test LILYPOND_BOOK_LILYPOND_FLAGS="--backend=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-test/collated-files.html 
+       $(MAKE) -C input/regression/ out=$(OUT_TEST) LILYPOND_BOOK_LILYPOND_FLAGS="--backend=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-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' 
        if test -d .git  ; then \
-               echo -n "HEAD is: " \
+               echo -e 'HEAD is:\n\n\t' ; \
                git log --max-count=1 --pretty=oneline ;\
-               echo -e '\n\ndiff\n' ; \
+               echo -e '\n\n\n' ; \
                git diff ; \
        fi > input/regression/out-test/tree.gittxt
 
@@ -221,7 +227,6 @@ test-baseline: test
        rm -rf input/regression/out-test-baseline
        mv input/regression/out-test input/regression/out-test-baseline
 
-RESULT_DIR=$(top-build-dir)/out/test-results
 local-check: test
        rm -rf $(RESULT_DIR)
        mkdir -p $(RESULT_DIR)
@@ -236,4 +241,4 @@ test-redo:
        $(MAKE) check
 
 test-clean:
-       $(MAKE) -C input/regression/ out=test clean
+       $(MAKE) -C input/regression/ out=$(OUT_TEST) clean

diff --git a/buildscripts/build-coverage.sh b/buildscripts/build-coverage.sh
index 76c59fa16b4bce88d69213df08b52af8185f60ae..42a0c20d83cb293f31848f5995b1201ca4e4dabd 100755 (executable)
--- a/buildscripts/build-coverage.sh
+++ b/buildscripts/build-coverage.sh
@@ -18,10 +18,11 @@ else
   find -name '*.gcda' -exec rm  '{}' ';'
 fi
 
-
+mkdir -p scripts/out-cov/
+touch  scripts/out-cov/midi2ly.1
 make conf=cov -j2 &&  \
-  make conf=cov test-real-clean LILYPOND_JOBS= && \
-  make conf=cov test LILYPOND_JOBS= 
+  make conf=cov test-clean OUT_TEST=testcov LILYPOND_JOBS= && \
+  make conf=cov test OUT_TEST=testcov LILYPOND_JOBS= 
 
 if test "$?" != "0"; then
   tail -100 out-cov/test-run.log