From: Graham Percival Date: Tue, 30 Aug 2011 05:36:35 +0000 (+0100) Subject: Merge segfault regtests X-Git-Tag: release/2.15.9-1~5^2 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a330f10f9fdf00408598031f4b2cb691039b2c92;p=lilypond.git Merge segfault regtests We haven't had a release in a month. More to the point, we haven't had a regtest comparison in a month. http://code.google.com/p/lilypond/issues/detail?id=1821 is not going away any time soon. It involves complicated stuff in the build system, which nobody wants to touch. As a temporary workaround, I will now reduce the number of regression tests. This commit merges segfault fixes. --- diff --git a/input/regression/ambitus-with-ligature.ly b/input/regression/ambitus-with-ligature.ly deleted file mode 100644 index c82e51ce40..0000000000 --- a/input/regression/ambitus-with-ligature.ly +++ /dev/null @@ -1,15 +0,0 @@ -\version "2.14" - -\header { - texidoc = " -A @code{\Voice} should be able to contain both an @code{Ambitus_engraver} -and a @code{Mensural_ligature_engraver} without segfaulting. - " -} - -\new Voice \with { - \consists Ambitus_engraver - \consists Mensural_ligature_engraver -} { - \[ c'\longa c''\longa \] -} diff --git a/input/regression/beam-skip.ly b/input/regression/beam-skip.ly deleted file mode 100644 index 798eb88901..0000000000 --- a/input/regression/beam-skip.ly +++ /dev/null @@ -1,8 +0,0 @@ - -\header { - texidoc = "Beams over skips do not cause a segfault." -} - -\version "2.15.3" - -\new Voice << { c'4 c'8 c' } { s8[ s] s[ s] } >> diff --git a/input/regression/book-label-no-segfault.ly b/input/regression/book-label-no-segfault.ly deleted file mode 100644 index d011c4ecc2..0000000000 --- a/input/regression/book-label-no-segfault.ly +++ /dev/null @@ -1,10 +0,0 @@ -\version "2.14.0" - -\header { - texidoc = " -A book(part) can contain only a label without causing a segfault. -" -} - -\book {\markup "foo"} % necessary to produce some output -\book { \label #'foo } diff --git a/input/regression/bookpart-variable.ly b/input/regression/bookpart-variable.ly deleted file mode 100644 index 992294c4ba..0000000000 --- a/input/regression/bookpart-variable.ly +++ /dev/null @@ -1,19 +0,0 @@ -\version "2.14.0" - - -\header { - texidoc = " -A @code{\bookpart} variable can be inserted in a @code{\book}. -No segfault should occur in this case. -" -} - -mypart = \bookpart { - \relative c' { - c1 - } -} - -\book { - \mypart -} diff --git a/input/regression/metronome-multimeasure-rest-no-segfault.ly b/input/regression/metronome-multimeasure-rest-no-segfault.ly deleted file mode 100644 index ceec61db50..0000000000 --- a/input/regression/metronome-multimeasure-rest-no-segfault.ly +++ /dev/null @@ -1,27 +0,0 @@ -\version "2.14.0" -\header { - texidoc = " -A metronome marking can be added to a multimeasure rest whose -engraver was moved to the Staff, without segfaulting. -" -} - - -\score { - \new Staff { - \tempo 4=150 - R1 | - } - \layout { - \context { - \Score - \remove "Metronome_mark_engraver" - \remove "Staff_collecting_engraver" - } - \context { - \Staff - \consists "Metronome_mark_engraver" - } - } -} - diff --git a/input/regression/segfaults-fixed.ly b/input/regression/segfaults-fixed.ly new file mode 100644 index 0000000000..c6749ede3b --- /dev/null +++ b/input/regression/segfaults-fixed.ly @@ -0,0 +1,104 @@ +\version "2.15.9" + +\header { + texidoc = " +This tests various segfault fixes from merging previously-separate +regtests together. The output is not important; all that matters +is that it compiles. + +Hopefully we can separate the regtests again in the future. +" +} +% merged to avoid +% http://code.google.com/p/lilypond/issues/detail?id=1821 + + +%%% book-label-no-segfault.ly +% A book(part) can contain only a label without causing a segfault. +\book {\markup "foo"} % necessary to produce some output +\book { \label #'foo } + + +%%% metronome-multimeasure-rest-no-segfault.ly +% A metronome marking can be added to a multimeasure rest whose +% engraver was moved to the Staff, without segfaulting. +\score { + \new Staff { + \tempo 4=150 + R1 | + } + \layout { + \context { + \Score + \remove "Metronome_mark_engraver" + \remove "Staff_collecting_engraver" + } + \context { + \Staff + \consists "Metronome_mark_engraver" + } + } +} + + +%%% ambitus-with-ligature.ly +% A @code{\Voice} should be able to contain both an +% @code{Ambitus_engraver} and a @code{Mensural_ligature_engraver} +% without segfaulting. +\new Voice \with { + \consists Ambitus_engraver + \consists Mensural_ligature_engraver +} { + \[ c'\longa c''\longa \] +} + + +%%% beam-skip.ly +% Beams over skips do not cause a segfault. +\new Voice << { c'4 c'8 c' } { s8[ s] s[ s] } >> + + +%%% bookpart-variable.ly +% A @code{\bookpart} variable can be inserted in a @code{\book}. +% No segfault should occur in this case. +mypart = \bookpart { + \relative c' { + c1 + } +} +\book { + \mypart +} + + +%%% skiptypesetting-all-true.ly +% A score with @code{skipTypesetting} set for the whole score +% will not segfault. +{ + \set Score.skipTypesetting = ##t + c'4 +} + + +%%% skiptypesetting-multimeasurerest.ly +% When @code{skipTypesetting} is set during a +% @code{skipBars}-induced @code{MultiMeasureRest} spanner, no +% segfault occurs. +<< + { + \time 3/4 + \set Score.skipBars = ##t + a4 a a + R2.*2 + } + \\ + { + \set Score.skipTypesetting = ##t + s2. s4 + \set Score.skipTypesetting = ##f + } +>> + + + + diff --git a/input/regression/skiptypesetting-all-true.ly b/input/regression/skiptypesetting-all-true.ly deleted file mode 100644 index 076548084e..0000000000 --- a/input/regression/skiptypesetting-all-true.ly +++ /dev/null @@ -1,15 +0,0 @@ -\version "2.14.0" - -\header{ - texidoc = " -A score with @code{skipTypesetting} set for the whole score -will not segfault. -" -} - - -{ - \set Score.skipTypesetting = ##t - c'4 -} - diff --git a/input/regression/skiptypesetting-multimeasurerest.ly b/input/regression/skiptypesetting-multimeasurerest.ly deleted file mode 100644 index 2a27f63050..0000000000 --- a/input/regression/skiptypesetting-multimeasurerest.ly +++ /dev/null @@ -1,23 +0,0 @@ -\version "2.14.0" - -\header { - texidoc = " -When @code{skipTypesetting} is set during a @code{skipBars}-induced -@code{MultiMeasureRest} spanner, no segfault occurs. -" -} - -<< - { - \time 3/4 - \set Score.skipBars = ##t - a4 a a - R2.*2 - } - \\ - { - \set Score.skipTypesetting = ##t - s2. s4 - \set Score.skipTypesetting = ##f - } ->>