Adapt ctest tagging rules to the changed file names of templates and examples.

diff --git a/development/autotests/ignoredTests b/development/autotests/ignoredTests
index 3f7d6e7c4663aee8fff67932df9d18e8c7d95438..850a7e70422f53d1b539459f8419c0006e183d58 100644 (file)
--- a/development/autotests/ignoredTests
+++ b/development/autotests/ignoredTests
@@ -46,8 +46,8 @@ export/templates/Articles/Copernicus_.*(dvi3|pdf4|pdf5)_(texF|systemF)
 
 # Document uses Postscript specials
 # Does not compile with pdflatex or non-TeX fonts (see note in the document source).
-export/examples/Graphics_._Insets/Instant_Preview_pdf[25].*
-export/examples/Graphics_._Insets/Instant_Preview_(dvi3|pdf4)_systemF
+export/examples/Graphics_and_Insets/Instant_Preview_pdf[25].*
+export/examples/Graphics_and_Insets/Instant_Preview_(dvi3|pdf4)_systemF
 
 export/examples/(chessgame|chess-article)_pdf[25].*
 export/examples/(|fr/)Presentations/Powerdot_pdf[25].*
@@ -125,14 +125,13 @@ export/templates/attic/latex8_(dvi|dvi3_.*|lyx(22|23))
 # aastex.cls is obsolete and replaced by aastex6.cls
 # aastex6.cls is obsolete and replaced by aastex62.cls
 export/doc/attic/aastex6_sample_(dvi|pdf|lyx(16|20|21|22|23)).*
-export/examples/Articles/American_Astronomical_Society_.*v._6.*
+export/examples/Articles/American_Astronomical_Society_.*v._6%29.*
 export/examples/Articles/American_Astronomical_Society_.*v._6.2.*_lyx16
-export/templates/Articles/American_Astronomical_Society_.*v._6.*
+export/templates/Articles/American_Astronomical_Society_.*v._6%29.*
 export/templates/Articles/American_Astronomical_Society_.*v._6.2.*_lyx16
 check_load/doc/attic/aastex6_sample
-check_load/examples/Articles/American_Astronomical_Society_.*v._6.
-check_load/templates/Articles/American_Astronomical_Society_.*v._6.
-
+check_load/examples/Articles/American_Astronomical_Society_.*v._6%29
+check_load/templates/Articles/American_Astronomical_Society_.*v._6%29
 
 
 # ==============================================================

diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests
index 760570aab089f32314f98324855278e916cf2c17..297bf7c4d9c269d72d6a6d10127749b0e09c2db7 100644 (file)
--- a/development/autotests/invertedTests
+++ b/development/autotests/invertedTests
@@ -36,8 +36,8 @@ export/export/latex/iconv-error-nomenclature_pdf2
 #      the float `sidebar'. LyX will not be able to produce a float list.
 #
 # which makes "check_load" and "lyx2lyx" fail (lyx2lyx for < 2.3 is ignored).
-check_load/templates/Articles/Association_for_Computing_Machinery_.ACM.
-export/templates/Articles/Association_for_Computing_Machinery_.ACM._lyx23
+check_load/templates/Articles/Association_for_Computing_Machinery_.*
+export/templates/Articles/Association_for_Computing_Machinery_.*_lyx23
 
 # Failing LyX2LyX conversions for old versions:
 #
@@ -215,8 +215,8 @@ export/(doc|examples)/uk/(Intro|Welcome)_(pdf4)_texF
 # Fails with XeTeX/LuaTeX
 # Reported upstream (https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg184435.html)
 # Is there a new version fixing the problem?
-export/examples/Articles/Astronomy_._Astrophysics_(dvi3|pdf[45])_.*
-export/templates/Articles/Astronomy_._Astrophysics_(dvi3|pdf[45])_.*
+export/examples/Articles/Astronomy_%26_Astrophysics_(dvi3|pdf[45])_.*
+export/templates/Articles/Astronomy_%26_Astrophysics_(dvi3|pdf[45])_.*
 
 # Gives the following error:
 # # ! Package hpstatement Error: H or P statement "H251"

diff --git a/development/autotests/unreliableTests b/development/autotests/unreliableTests
index 7be2b4fe34598e464095d7c08b30bd5c80459ec0..eaee41ddd09e53301ebbe91a9b7abda709d37734 100644 (file)
--- a/development/autotests/unreliableTests
+++ b/development/autotests/unreliableTests
@@ -82,8 +82,8 @@ Sublabel: needauth
 ##################
 # Tests that require authorisation to call external programs.
 export/examples/External_Material/Gnuplot.*
-export/examples/Graphics_._Insets/Minted_File_Listing.*
-export/examples/Graphics_._Insets/Minted_Listings.*
+export/examples/Graphics_and_Insets/Minted_File_Listing.*
+export/examples/Graphics_and_Insets/Minted_Listings.*
 
 
 Sublabel: erratic