From: Julien Rioux <julien.rioux@gmail.com>
Date: Sat, 26 Jul 2014 18:46:49 +0000 (+0200)
Subject: Add reg test (issue 4046)
X-Git-Tag: release/2.19.13-1~31
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=144235e529276c3d8fd2ba88705177f47963a385;p=lilypond.git

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 935f068db7..ebe18303f5 100644
--- 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 1e790908a6..2444ac8536 100644
--- 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
index 0000000000..e21f02cd44
--- /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 bcad93601b..f5005ed71c 100644
--- 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 251fa087d8..bcc2a6ef4a 100644
--- 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 610eb23a3e..d32e767c17 100644
--- 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