[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Add regtest directory for svg output (issue 2230). (issue 5815043)
From: |
julien . rioux |
Subject: |
Add regtest directory for svg output (issue 2230). (issue 5815043) |
Date: |
Tue, 13 Mar 2012 21:15:35 +0000 |
Reviewers: MikeSol, phileholmes_googlemail.com,
Message:
Please review.
Description:
Add regtest directory for svg output (issue 2230).
Please review this at http://codereview.appspot.com/5815043/
Affected files:
M GNUmakefile.in
M input/regression/GNUmakefile
A input/regression/svg/GNUmakefile
M scripts/build/output-distance.py
Index: GNUmakefile.in
diff --git a/GNUmakefile.in b/GNUmakefile.in
index
2d22f9f378202c703591eb6d7c0c50a3b89d290e..a9cb75c1453293c4f05868942977a82496161d9a
100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -287,6 +287,7 @@ test:
$(MAKE) -C input/regression/musicxml out=test local-test
$(MAKE) -C input/regression/abc2ly out=test local-test
$(MAKE) -C input/regression/lilypond-book out=test local-test
+ $(MAKE) -C input/regression/svg out=test local-test
test-baseline:
@if test -d .git ; then \
@@ -299,6 +300,7 @@ test-baseline:
$(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) out=test -C input/regression/svg local-test-baseline
$(MAKE) test-snippets-clean
@@ -307,7 +309,8 @@ local-check: test
mkdir -p $(RESULT_DIR)
$(buildscript-dir)/output-distance --create-images --output-dir
$(RESULT_DIR) \
input/regression/out-test-baseline input/regression/out-test \
- input/regression/midi/out-test-baseline
input/regression/midi/out-test
+ input/regression/midi/out-test-baseline
input/regression/midi/out-test \
+ input/regression/svg/out-test-baseline
input/regression/svg/out-test
@find input ly -name '*.ly' -print |grep -v 'out.*/' | xargs
grep '\\version' -L | grep -v "standard input" |sed 's/^/**** Missing
version: /g'
Index: input/regression/GNUmakefile
diff --git a/input/regression/GNUmakefile b/input/regression/GNUmakefile
index
cc769e7c2f5843c060c7ce3aef80e7a5f23a70d4..e9402fb43938b98a4c6ff5d5fbdef237f63526fa
100644
--- a/input/regression/GNUmakefile
+++ b/input/regression/GNUmakefile
@@ -6,4 +6,4 @@ LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
include $(depth)/make/stepmake.make
TITLE=LilyPond Regression Tests
-SUBDIRS=midi musicxml abc2ly lilypond-book
+SUBDIRS=abc2ly lilypond-book midi musicxml svg
Index: input/regression/svg/GNUmakefile
diff --git a/input/regression/svg/GNUmakefile
b/input/regression/svg/GNUmakefile
new file mode 100644
index
0000000000000000000000000000000000000000..dc15e0a3dc70fac9ffd04a004d08853a38f27483
--- /dev/null
+++ b/input/regression/svg/GNUmakefile
@@ -0,0 +1,23 @@
+depth = ../../..
+
+STEPMAKE_TEMPLATES=documentation texinfo tex
+LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
+
+#TEXI2HTML_FLAGS += --nomenu
+
+#TMP = $(sort $(LY_FILES) $(TEXINFO_SOURCES) )
+#COLLATED_FILES = ${LY_FILES:%.ly=$(outdir)/%.svg}
+#COLLATED_FILES = ${LY_FILES}
+
+SVG_FILES= ${LY_FILES:%.ly=$(outdir)/%.svg}
+
+include $(depth)/make/stepmake.make
+
+TITLE=SVG test suite
+
+local-test: $(outdir)/collated-files.html
+
+$(outdir)/collated-files.html: ${SVG_FILES}
+
+$(outdir)/%.svg: %.ly
+ $(LILYPOND_BINARY) -dbackend=svg -dlog-file="$(basename $@)" -o $(outdir)
$<
Index: scripts/build/output-distance.py
diff --git a/scripts/build/output-distance.py
b/scripts/build/output-distance.py
index
734b366f6b7ed91a0232ac36dae090ab7b7675b5..1192dd14d2b1d1ec35fda0f57202da2d6e942fc9
100755
--- a/scripts/build/output-distance.py
+++ b/scripts/build/output-distance.py
@@ -856,11 +856,15 @@ class ComparisonData:
self.compare_trees (d1, d2)
def compare_directories (self, dir1, dir2):
- for ext in ['signature',
- 'midi',
- 'log',
- 'profile',
- 'gittxt']:
+ exts = [
+ 'gittxt',
+ 'log',
+ 'midi',
+ 'profile',
+ 'signature',
+ 'svg',
+ ]
+ for ext in exts:
(paired, m1, m2) = paired_files (dir1, dir2, '*.' + ext)
self.missing += [(dir1, m) for m in m1]
@@ -881,10 +885,11 @@ class ComparisonData:
else:
ext = os.path.splitext (f1)[1]
klasses = {
- '.midi': MidiFileLink,
+ '.gittxt': GitFileCompareLink,
'.log' : LogFileCompareLink,
+ '.midi': MidiFileLink,
'.profile': ProfileFileLink,
- '.gittxt': GitFileCompareLink,
+ '.svg' : TextFileCompareLink,
}
if klasses.has_key (ext):
@@ -1010,12 +1015,13 @@ class ComparisonData:
<body>
<p>
click to filter rows by type:
+ <a href="#" onClick="showOnlyMatchingRows('.gittxt')">gittxt</a> /
+ <a href="#" onClick="showOnlyMatchingRows('.log')">log</a> /
<a href="#" onClick="showOnlyMatchingRows('.ly')">ly</a> /
+ <a href="#" onClick="showOnlyMatchingRows('.midi')">midi</a> /
<a href="#" onClick="showOnlyMatchingRows('.profile')">profiling</a> /
<a href="#" onClick="showOnlyMatchingRows('.signature')">signature</a> /
- <a href="#" onClick="showOnlyMatchingRows('.midi')">midi</a> /
- <a href="#" onClick="showOnlyMatchingRows('.log')">log</a> /
- <a href="#" onClick="showOnlyMatchingRows('.gittxt')">gittxt</a> /
+ <a href="#" onClick="showOnlyMatchingRows('.svg')">svg</a> /
<a href="#" onClick="showOnlyMatchingRows('')">reset to all</a>
</p>
- Add regtest directory for svg output (issue 2230). (issue 5815043),
julien . rioux <=