The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 9f7c8be6d794763452eac592ea9096046a8a06b9 Author: Kornel Benko <[email protected]> Date: Sat Dec 15 15:38:48 2012 +0100 Cmake build tex2lyx testing: To please Georg: 1.) Do _not_ use globbing to get test file 2.) Do not evaluate stderr output of tex2lyx diff --git a/src/tex2lyx/test/CMakeLists.txt b/src/tex2lyx/test/CMakeLists.txt index ae2037a..2b3ddb4 100644 --- a/src/tex2lyx/test/CMakeLists.txt +++ b/src/tex2lyx/test/CMakeLists.txt @@ -6,9 +6,13 @@ project(test) -file(GLOB _tex_tests RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/*.ltx" "${CMAKE_CURRENT_SOURCE_DIR}/*.tex") +#file(GLOB _tex_tests RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/*.ltx" "${CMAKE_CURRENT_SOURCE_DIR}/*.tex") +# +#list(REMOVE_ITEM _tex_tests DummyDocument.tex) -list(REMOVE_ITEM _tex_tests DummyDocument.tex) +set(_tex_tests test.ltx test-structure.tex test-insets.tex + test-modules.tex box-color-size-space-align.tex + CJK.tex XeTeX-polyglossia.tex) foreach(_fl ${_tex_tests}) set(fl ${_fl}) diff --git a/src/tex2lyx/test/runtests.py b/src/tex2lyx/test/runtests.py index 94132a0..358aa4e 100755 --- a/src/tex2lyx/test/runtests.py +++ b/src/tex2lyx/test/runtests.py @@ -68,10 +68,6 @@ def main(argv): errorstring = proc.stderr.read() if not errorstring is None: print errorstring - if err == 0: - matchObj = re.match(r'.*: +Error +in +.*', errorstring, re.M|re.S) - if matchObj: - err = 9999 if err != 0: errors.append(f) elif not overwrite: ----------------------------------------------------------------------- Summary of changes: src/tex2lyx/test/CMakeLists.txt | 8 ++++++-- src/tex2lyx/test/runtests.py | 4 ---- 2 files changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- The LyX Source Repository
