From 59f4d0d75362ab878f3e861c49245834c58a301b Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Wed, 12 Mar 2014 17:15:07 +0100 Subject: [PATCH] ctest export: smal improvements 1.) Use of regex to ignore group of tests 2.) If default output format is pdf2(pdflatex), the try to check also for xelatex and lualatex --- development/autotests/CMakeLists.txt | 12 +++++++++++- development/autotests/ignoredTests | 20 +++++++------------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/development/autotests/CMakeLists.txt b/development/autotests/CMakeLists.txt index 76ab043a4a..6321c122a0 100644 --- a/development/autotests/CMakeLists.txt +++ b/development/autotests/CMakeLists.txt @@ -114,6 +114,8 @@ macro(getoutputformats filepath varname) if(_l MATCHES "^\\\\default_output_format +\([^ ]+\)") if(CMAKE_MATCH_1 STREQUAL "default") set(found ${out_formats}) + elseif(CMAKE_MATCH_1 STREQUAL "pdf2") + set(found "pdf2" "pdf4" "pdf5") elseif(CMAKE_MATCH_1 STREQUAL "xhtml") set(found "xhtml") else() @@ -126,7 +128,15 @@ macro(getoutputformats filepath varname) endmacro() macro(maketestname testname reverted listreverted listignored) - list(FIND ${listignored} ${${testname}} _idx) + set(_idx -1) + foreach(_itrx ${${listignored}}) + set(_itr "^${_itrx}$") + if(${testname} MATCHES ${_itr}) + set(_idx 0) + break() + endif() + endforeach() + #list(FIND ${listignored} ${${testname}} _idx) if (${_idx} LESS 0) list(FIND ${listreverted} ${${testname}} _idx) if (${_idx} LESS 0) diff --git a/development/autotests/ignoredTests b/development/autotests/ignoredTests index e25ac4b781..174247dbfa 100644 --- a/development/autotests/ignoredTests +++ b/development/autotests/ignoredTests @@ -1,17 +1,11 @@ +# Entries may be regular expressions +# they will be automatically enclosed with '^' and '$' # # latex8.sty is obsolete and replaced by IEEEconf. check_load/templates/attic/latex8 -export/templates/attic/latex8_pdf -export/templates/attic/latex8_pdf2 -export/templates/attic/latex8_pdf5_systemF -export/templates/attic/latex8_pdf5_texF -export/templates/attic/latex8_dvi -export/templates/attic/latex8_dvi3_systemF -export/templates/attic/latex8_dvi3_texF -export/templates/attic/latex8_pdf3 -export/templates/attic/latex8_pdf4_systemF -export/templates/attic/latex8_pdf4_texF +export/templates/attic/latex8_pdf.* # LuaTeX and XeTeX both enter in infinite loops -export/examples/JASA_dvi3_systemF -export/examples/JASA_pdf4_systemF -export/examples/JASA_pdf5_systemF +export/examples/JASA_.*_systemF +# +# not compilable with LuaTeX +export/doc/hu/Tutorial_pdf5_.*