Add reg test (issue 4046)

Test nested include files and use lybook-testdb during make test.

diff --git a/input/regression/lilypond-book/GNUmakefile b/input/regression/lilypond-book/GNUmakefile
index 935f068db7c392386cdc0b746f9702313bc95770..ebe18303f57bb951dbe728a680248d8fc141e4e4 100644 (file)
--- a/input/regression/lilypond-book/GNUmakefile
+++ b/input/regression/lilypond-book/GNUmakefile
@@ -18,7 +18,8 @@ OUT_TELY_FILES += ${TELY_FILES:%.tely=$(outdir)/%.pdf}
 
 XML_FILES = $(filter-out include%,$(call src-wildcard,*.xml))
 
-local-test: $(OUT_FILES)
+local-test:
+       make LYS_OUTPUT_DIR=$(top-build-dir)/out/lybook-testdb $(OUT_FILES)
 
 $(outdir)/collated-files.list: $(OUT_FILES)
        echo $(sort $(filter-out %.xml,$(OUT_FILES))) > $@

diff --git a/input/regression/lilypond-book/include.ly b/input/regression/lilypond-book/include.ly
index 1e790908a61c133ad9a9fa1f33e95bf6698ef839..2444ac853600668eb4900a4e58399d430fbcece1 100644 (file)
--- a/input/regression/lilypond-book/include.ly
+++ b/input/regression/lilypond-book/include.ly
@@ -1,4 +1,5 @@
 \version "2.16.0"
+\include "melody.ly"
 \score {
-       \relative c'' { \key c \minor c4 es g2 }
+       \melody
 }

diff --git a/input/regression/lilypond-book/melody.ly b/input/regression/lilypond-book/melody.ly
new file mode 100644 (file)
index 0000000..e21f02c
--- /dev/null
+++ b/input/regression/lilypond-book/melody.ly
@@ -0,0 +1,3 @@
+\version "2.16.0"
+\include "include/myvar.ily"
+melody = \relative c'' { \key c \minor c4 es g2 \myVar }

diff --git a/input/regression/lilypond-book/tex-include-file.lytex b/input/regression/lilypond-book/tex-include-file.lytex
index bcad93601b0e8f39325bb93f6f03cb61dfd5a399..f5005ed71cbc981326b217997d308afa69e8f49b 100644 (file)
--- a/input/regression/lilypond-book/tex-include-file.lytex
+++ b/input/regression/lilypond-book/tex-include-file.lytex
@@ -14,4 +14,9 @@ Within a lilypond block:
   \include "include/myvar.ily"
   \relative c'' { \myVar }
 \end{lilypond}
+
+Include a file that includes a file:
+
+\lilypondfile{include.ly}
+
 \end{document}

diff --git a/input/regression/lilypond-book/tex-include-options.lytex b/input/regression/lilypond-book/tex-include-options.lytex
index 251fa087d80ebe334ec150d2cce2011e58da4a7d..bcc2a6ef4abefc374dfc39d00046bc3c14ea3e7d 100644 (file)
--- a/input/regression/lilypond-book/tex-include-options.lytex
+++ b/input/regression/lilypond-book/tex-include-options.lytex
@@ -14,4 +14,9 @@ Within a lilypond block:
   \include "include/myvar.ily"
   \relative c'' { \myVar }
 \end{lilypond}
+
+Include a file that includes a file:
+
+\lilypondfile[quote,noindent]{include.ly}
+
 \end{document}

diff --git a/input/regression/lilypond-book/texinfo-include-file.tely b/input/regression/lilypond-book/texinfo-include-file.tely
index 610eb23a3eb46e34eaa9d07f1e9ae3de34d71e2d..d32e767c176d8b740b37ea30b887920637fff636 100644 (file)
--- a/input/regression/lilypond-book/texinfo-include-file.tely
+++ b/input/regression/lilypond-book/texinfo-include-file.tely
@@ -20,4 +20,8 @@ Within a lilypond block:
   \relative c'' { \myVar }
 @end lilypond
 
+Include a file that includes a file:
+
+@lilypondfile{include.ly}
+
 @bye