From ddacfc0581e61c12eed1fd3e4b2d68291a553860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnter=20Milde?= Date: Tue, 11 Apr 2017 09:51:23 +0200 Subject: [PATCH] ctests: test unicodesymbols also with utf8. The the default input encoding (utf8) whas somehow dropped from the list. Restore it with explicit naming. --- development/autotests/ExportTests.cmake | 2 +- development/autotests/invertedTests | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/development/autotests/ExportTests.cmake b/development/autotests/ExportTests.cmake index ad99163348..3aa57677da 100644 --- a/development/autotests/ExportTests.cmake +++ b/development/autotests/ExportTests.cmake @@ -393,7 +393,7 @@ foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates autote #message(STATUS "Test ${TestName} matches Unicode encodings") # test_encodings does not include "default", since it should be covered # by one of the supplied encodings - set(test_encodings "ascii" "utf8x" "armscii8" "applemac" + set(test_encodings "ascii" "utf8" "utf8x" "armscii8" "applemac" "cp437" "cp437de" "cp850" "cp852" "cp855" "cp862" "cp865" "cp866" "cp1250" "cp1251" "cp1252" diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index 4830a9d813..50de35e9a7 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -158,10 +158,9 @@ export/export/latex/ru-accent-ascii.* #9681 textgreek and textcyr also required for encodable characters # Greek fails with utf8 and utf8x, # Cyrillic fails with utf8 and cyrillic encodings: -export/export/latex/unicodesymbols/008-greek-and-coptic(|_utf8x)_pdf2 -export/export/latex/unicodesymbols/009-cyrillic(|_utf8x)_pdf2 -export/export/latex/unicodesymbols/009-cyrillic_(cp855|cp866|cp1251|koi8-r|koi8-u|iso8859-5|pt154)_pdf2 -export/export/latex/unicodesymbols/069-greek-extended(|_utf8x)_pdf2 +export/export/latex/unicodesymbols/008-greek-and-coptic_utf8x?_pdf2 +export/export/latex/unicodesymbols/009-cyrillic_(utf8|utf8x|cp855|cp866|cp1251|koi8-r|koi8-u|iso8859-5|pt154)_pdf2 +export/export/latex/unicodesymbols/069-greek-extended_utf8x?_pdf2 export/export/latex/unicodesymbols/069-greek-extended-textalpha_utf8x_pdf2