From d4f42ed8284dac3bbe5f0ddcdf2ca680dbe2c6b8 Mon Sep 17 00:00:00 2001
From: Kornel Benko <kornel@lyx.org>
Date: Tue, 26 Mar 2019 15:45:54 +0100
Subject: [PATCH] Cmake export tests: make even more tests pass

---
 development/autotests/invertedTests         |  5 ++++-
 development/autotests/unreliableTests       |  3 +--
 development/batchtests/beamer_test.tex.orig | 17 +++++++----------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests
index fdad467584..3b1d684d4b 100644
--- a/development/autotests/invertedTests
+++ b/development/autotests/invertedTests
@@ -100,7 +100,10 @@ export/examples/sr/Modules/Braille_(dvi3|pdf4)_systemF
 # no-termination of replacement macros can lead to non-existing macros if
 # unencodable or force-converted Greek or Cyrillic letters are immediately
 # followed by Latin letters. See also unreliableTests.
-export/export/latex/textcyr-textgreek-test_pdf2
+#export/export/latex/textcyr-textgreek-test_pdf2
+
+# Kornel: unknown reason
+export/export/latex/unicodesymbols/012-31-hebrew_he-.*_pdf2
 
 #9871 LyX sends invalid Unicode to iconv when converting to ASCII
 # most probably due to BabelPreamble code (language specific headings for
diff --git a/development/autotests/unreliableTests b/development/autotests/unreliableTests
index 33c2270f1e..21d7bd0b02 100644
--- a/development/autotests/unreliableTests
+++ b/development/autotests/unreliableTests
@@ -195,8 +195,7 @@ export/export/mixing_inTitle_layouts_(pdf|dvi).*
 # https://www.mail-archive.com/search?l=mid&q=20160831134006.4fewxothddqfeyw4%40steph
 # (not expecting much attention because DVI is not given high priority)
 export/doc/es/Customization_dvi3_systemF
-export/examples/(|es/)Curricula_Vitae/Europe_CV_dvi3_systemF
-export/examples/(|es/)Curricula_Vitae/Modern_CV_dvi3_systemF
+export/examples/(|es/)Curricula_Vitae/Europe_CV_dvi3_.*F
 
 # `acmart` requires PDFlatex:
 # * Missing page number in DVI, Postscript, and PDF (ps2pdf)
diff --git a/development/batchtests/beamer_test.tex.orig b/development/batchtests/beamer_test.tex.orig
index 88250081d9..e3660c68dc 100644
--- a/development/batchtests/beamer_test.tex.orig
+++ b/development/batchtests/beamer_test.tex.orig
@@ -1,6 +1,6 @@
 %% LyX 2.4.0dev created this file.  For more info, see https://www.lyx.org/.
 %% Do not edit unless you really know what you are doing.
-\documentclass[american,english]{beamer}
+\documentclass[english]{beamer}
 \usepackage{lmodern}
 \renewcommand{\sfdefault}{lmss}
 \renewcommand{\ttdefault}{lmtt}
@@ -21,9 +21,8 @@
 \makeatletter
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LyX specific LaTeX commands.
-\providecommand{\LyX}{\texorpdfstring%
-  {L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\@}
-  {LyX}}
+\providecommand{\LyX}{\texorpdfstring{\textlatin{%
+  L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\@}}{LyX}}
 \DeclareRobustCommand*{\lyxarrow}{%
 \@ifstar
 {\leavevmode\,$\triangleleft$\,\allowbreak}
@@ -166,9 +165,8 @@ you want to be repeated via \alert{Insert\lyxarrow Overlay Specifications}
 \begin{itemize}
 \item Note that all frame content, if the style is not \structure{Frame},
 must be nested to the frame environment (via \alert{Edit\lyxarrow Increase List Depth}
-or \shortcut{\selectlanguage{american}%
-Alt+Shift+Right\selectlanguage{english}%
-}). This is done automatically if you insert new frame paragraphs.
+or \shortcut{Alt+Shift+Right}). This is done automatically if you
+insert new frame paragraphs.
 \item Nested content is marked by a red bar in the margin of the \LyX{} workarea
 \end{itemize}
 \end{frame}
@@ -188,9 +186,8 @@ below the frame (see UserGuide, sec.~3.4.6).
 
 There is a simple and much more convenient way to start a new frame:
 Issue \alert{Insert\lyxarrow Separated Frame Below} (\shortcut{undefined}
-if you are in a non-nested \structure{Frame} paragraph, or \shortcut{\selectlanguage{american}%
-Alt+P Shift+Return\selectlanguage{english}%
-}, respectively, if you are in a nested paragraph within the frame).
+if you are in a non-nested \structure{Frame} paragraph, or \shortcut{Alt+P Shift+Return},
+respectively, if you are in a nested paragraph within the frame).
 If you are in the frame heading, \alert{Insert\lyxarrow Separated Frame Above}
 inserts a new, properly separated frame above the current one!
 \end{block}
-- 
2.39.5