On Mon, Jan 28, 2013 at 10:42 PM, Scott Kostyshak <skost...@lyx.org> wrote:
> On Mon, Jan 28, 2013 at 10:09 PM, <skost...@lyx.org> wrote:
>> From: Scott Kostyshak <skost...@lyx.org>
>>
>> This test should fail because #7673 is not yet fixed in trunk.
>> Note that it is fixed in branch.
>
> Can someone confirm that this test runs correctly (and fails) on CMake
> and/or autotools?
> The previous patch in this series should be applied also but it
> shouldn't make a difference if this test is just run once.
Attached are the patches. Do most developers around here prefer emails
or attached patches?
Scott
From 4e3ad2efe6f7f16c76994759953a65f16162fd73 Mon Sep 17 00:00:00 2001
From: Scott Kostyshak <skost...@lyx.org>
Date: Sun, 27 Jan 2013 06:21:18 -0500
Subject: [PATCH 1/2] autotests: clean up .emergency file of input .lyx
If the test opens an existing .lyx file and crashes, it will leave
around a .emergency file. If a test with that same name is run again,
LyX will try to recover the .emergency file, which could throw
off the test.
This is implemented for both CMake and autotools.
---
development/autotests/single-test.cmake | 6 +++++-
development/autotests/single-test.sh | 6 ++++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/development/autotests/single-test.cmake
b/development/autotests/single-test.cmake
index 89a6fdd..3f452cc 100755
--- a/development/autotests/single-test.cmake
+++ b/development/autotests/single-test.cmake
@@ -67,13 +67,17 @@ set(ENV{KEYTEST_OUTFILE} "${WORKDIR}/${KEYTEST_OUTFILE}")
set(ENV{PO_BUILD_DIR} "${PO_BUILD_DIR}")
set(ENV{MAX_DROP} 0)
set(ENV{MAX_LOOPS} 1)
+string(REGEX REPLACE "-in\\.(txt|sh)$" "" _jj ${KEYTEST_INFILE})
+if(EXISTS "${WORKDIR}/../${_jj}.lyx.emergency")
+ execute_process(
+ COMMAND ${CMAKE_COMMAND} -E remove -f "${WORKDIR}/../${_jj}.lyx.emergency" )
+endif()
file(GLOB _testfiles RELATIVE "${WORKDIR}" "test*.*" "#test*.*")
if(_testfiles)
# remove some leftover files from previous test
execute_process(
COMMAND ${CMAKE_COMMAND} -E remove -f ${_testfiles} )
endif()
-string(REGEX REPLACE "-in\\.(txt|sh)$" "" _jj ${KEYTEST_INFILE})
if(EXISTS "${AUTOTEST_ROOT}/${_jj}.lyx")
configure_file("${AUTOTEST_ROOT}/${_jj}.lyx" "${WORKDIR}/../${_jj}.lyx"
COPYONLY)
endif()
diff --git a/development/autotests/single-test.sh
b/development/autotests/single-test.sh
index 72b8eeb..3cf509a 100755
--- a/development/autotests/single-test.sh
+++ b/development/autotests/single-test.sh
@@ -15,6 +15,12 @@ if [ "$1" != "" ]; then
KEYTEST_INFILE="$1";
fi
+BASE=$( echo $KEYTEST_INFILE | sed 's/-in\.\(txt\|sh\)$//')
+if [ -e $BASE.lyx.emergency ]; then
+ echo "removing $BASE.lyx.emergency"
+ rm $BASE.lyx.emergency
+fi
+
export MAX_DROP=0
if [ "$(pidof lyx)" != "" ]; then
export LYX_PID=$(pidof lyx)
--
1.7.9.5
From 6febbb7359e5b1c6755e4266f6c5714d66e3f74d Mon Sep 17 00:00:00 2001
From: Scott Kostyshak <skost...@lyx.org>
Date: Sun, 27 Jan 2013 05:51:01 -0500
Subject: [PATCH 2/2] Add an autotest for #7673
This test should fail because #7673 is not yet fixed in trunk.
Note that it is fixed in branch.
This is the first autotest that uses an existing .lyx file,
bug-7673.lyx.
---
development/autotests/bug-7673-in.txt | 9 ++
development/autotests/bug-7673.lyx | 157 +++++++++++++++++++++++++++++++++
2 files changed, 166 insertions(+)
create mode 100644 development/autotests/bug-7673-in.txt
create mode 100644 development/autotests/bug-7673.lyx
diff --git a/development/autotests/bug-7673-in.txt
b/development/autotests/bug-7673-in.txt
new file mode 100644
index 0000000..ceb3bfd
--- /dev/null
+++ b/development/autotests/bug-7673-in.txt
@@ -0,0 +1,9 @@
+# see http://www.lyx.org/trac/ticket/7673#comment:15
+#
+Lang en_US.utf8
+TestBegin ../bug-7673.lyx > lyx-log.txt 2>&1
+KK: \Ax
+# 'outline-in' was needed to reproduce the crash on some commits when bisecting
+KK: command-sequence repeat 3 char-forward; outline-in; down; down\[Return]
+TestEnd
+Assert ! pcregrep -M 'SIGSEGV' lyx-log.txt
diff --git a/development/autotests/bug-7673.lyx
b/development/autotests/bug-7673.lyx
new file mode 100644
index 0000000..37e0a2b
--- /dev/null
+++ b/development/autotests/bug-7673.lyx
@@ -0,0 +1,157 @@
+#LyX 2.1 created this file. For more info see http://www.lyx.org/
+\lyxformat 459
+\begin_document
+\begin_header
+\textclass report
+\use_default_options true
+\maintain_unincluded_children false
+\language english
+\language_package default
+\inputencoding auto
+\fontencoding global
+\font_roman default
+\font_sans default
+\font_typewriter default
+\font_math auto
+\font_default_family default
+\use_non_tex_fonts false
+\font_sc false
+\font_osf false
+\font_sf_scale 100
+\font_tt_scale 100
+\graphics default
+\default_output_format default
+\output_sync 0
+\bibtex_command default
+\index_command default
+\paperfontsize default
+\spacing single
+\use_hyperref false
+\papersize default
+\use_geometry false
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package esint 1
+\use_package mathdots 1
+\use_package mathtools 0
+\use_package mhchem 1
+\use_package stackrel 0
+\use_package stmaryrd 0
+\use_package undertilde 0
+\cite_engine basic
+\cite_engine_type numerical
+\biblio_style plain
+\use_bibtopic false
+\use_indices false
+\paperorientation portrait
+\suppress_date false
+\justification true
+\use_refstyle 1
+\index Index
+\shortcut idx
+\color #008000
+\end_index
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation indent
+\paragraph_indentation default
+\quotes_language english
+\papercolumns 1
+\papersides 1
+\paperpagestyle default
+\tracking_changes false
+\output_changes false
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
+\end_header
+
+\begin_body
+
+\begin_layout Chapter
+One
+\end_layout
+
+\begin_layout Standard
+\begin_inset Float table
+wide false
+sideways false
+status open
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\begin_layout Plain Layout
+\begin_inset Tabular
+<lyxtabular version="3" rows="2" columns="2">
+<features rotate="0" tabularvalignment="middle">
+<column alignment="center" valignment="top" width="0">
+<column alignment="center" valignment="top" width="0">
+<row>
+<cell alignment="center" valignment="top" topline="true" bottomline="true"
leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" bottomline="true"
leftline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row>
+<cell alignment="center" valignment="top" topline="true" bottomline="true"
leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" bottomline="true"
leftline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+</cell>
+</row>
+</lyxtabular>
+
+\end_inset
+
+
+\begin_inset Caption Standard
+
+\begin_layout Plain Layout
+table caption
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_body
+\end_document
--
1.7.9.5
