The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 7ac59e7b99411b4f4aa8250fa30dc47ca475642a Author: Scott Kostyshak <[email protected]> Date: Sat Feb 16 05:06:38 2013 -0500 Update expected test failures diff --git a/development/expectedTestFailures b/development/expectedTestFailures index bd85ca5..04f4f80 100644 --- a/development/expectedTestFailures +++ b/development/expectedTestFailures @@ -26,3 +26,13 @@ export/doc/Math_pdf2 #8517 export/doc/Math_pdf5 #8517 tex2lyx/roundtrip/CJKutf8.tex tex2lyx2lyx/roundtrip/CJKutf8.tex +export/examples/noweb2lyx_pdf5 +export/examples/Foils_pdf +export/examples/Foils_pdf2 +export/examples/Foils_pdf5 +export/examples/sweave_pdf +export/examples/Literate_pdf5 +export/examples/tufte-book_pdf +export/examples/listerrors_pdf2 +export/examples/listerrors_pdf5 +export/examples/docbook_article_pdf commit 5f1ae5fb562fb713e9dfd4fa1db196f77daf0b54 Author: Scott Kostyshak <[email protected]> Date: Sat Feb 16 04:58:47 2013 -0500 powerdot-example.lyx: set default format to ps2pdf This way compilation works out of the box. diff --git a/lib/examples/powerdot-example.lyx b/lib/examples/powerdot-example.lyx index ce0f71a..8f6cead 100644 --- a/lib/examples/powerdot-example.lyx +++ b/lib/examples/powerdot-example.lyx @@ -27,7 +27,7 @@ \font_tt_scale 100 \graphics default -\default_output_format default +\default_output_format pdf \output_sync 0 \bibtex_command default \index_command default commit cf4917a220b5833eeb3ecc421869f41735685cba Author: Scott Kostyshak <[email protected]> Date: Sat Feb 16 04:57:02 2013 -0500 instant_preview.lyx: set default format to ps2pdf This way compilation works out of the box. diff --git a/lib/examples/instant_preview.lyx b/lib/examples/instant_preview.lyx index 7c7565b..c3aa9c7 100644 --- a/lib/examples/instant_preview.lyx +++ b/lib/examples/instant_preview.lyx @@ -31,7 +31,7 @@ \font_tt_scale 100 \graphics default -\default_output_format default +\default_output_format pdf \output_sync 0 \bibtex_command default \index_command default commit 9f4927e8557af79bcd0c1c26cc60dace24d90400 Author: Scott Kostyshak <[email protected]> Date: Sat Feb 16 02:54:17 2013 -0500 Add examples to export tests (CMake & autotools) Now all export tests can be run with: ctest -R "export" Only export tests for manuals can be run with: ctest -R "export/doc" And only export tests for examples can be run with: ctest -R "export/examples" diff --git a/development/autotests/CMakeLists.txt b/development/autotests/CMakeLists.txt index 3e643fe..131c8b9 100644 --- a/development/autotests/CMakeLists.txt +++ b/development/autotests/CMakeLists.txt @@ -62,7 +62,7 @@ macro(getdefaultoutputformat filepath varname) endforeach() endmacro() -foreach(libsubfolder doc) +foreach(libsubfolder doc examples) set(LIBSUB_SRC_DIR "${TOP_SRC_DIR}/lib/${libsubfolder}") file(GLOB lyx_files RELATIVE "${LIBSUB_SRC_DIR}" "${LIBSUB_SRC_DIR}/*.lyx") foreach(f ${lyx_files}) diff --git a/development/autotests/export-in.sh b/development/autotests/export-in.sh index 4757695..adf2ce1 100755 --- a/development/autotests/export-in.sh +++ b/development/autotests/export-in.sh @@ -1,7 +1,7 @@ #!/bin/bash failed=0 -for libsubdir in doc; do +for libsubdir in doc examples; do for format in xhtml lyx16x; do for f in $LYX_ROOT/lib/$libsubdir/*lyx; do if $LYX_EXE -e $format $f >> lyx-log.txt 2>&1; then commit 2fd0c34b9b3cc519a9d7e549032c0b8f730f15a9 Author: Scott Kostyshak <[email protected]> Date: Sat Feb 16 03:05:08 2013 -0500 CMake: change name of export autotests Instead of 'autotests/export/doc/' export tests are prefixed with 'export/doc/'. This has the advantage of the name better reflecting the test (export tests are not autotests), but has a disadvantage in that the old name gave a better idea of where the export test scripts are located (in the autotests directory). diff --git a/development/autotests/CMakeLists.txt b/development/autotests/CMakeLists.txt index a0e06d7..3e643fe 100644 --- a/development/autotests/CMakeLists.txt +++ b/development/autotests/CMakeLists.txt @@ -68,7 +68,7 @@ foreach(libsubfolder doc) foreach(f ${lyx_files}) # Strip extension string(REGEX REPLACE "\\.lyx$" "" f ${f}) - add_test(NAME export/autotests/${libsubfolder}/${f}_lyx16 + add_test(NAME export/${libsubfolder}/${f}_lyx16 WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}" COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${LIBSUB_SRC_DIR} -Dlyx=$<TARGET_FILE:${_lyx}> @@ -78,7 +78,7 @@ foreach(libsubfolder doc) -P "${TOP_SRC_DIR}/development/autotests/export.cmake") getdefaultoutputformat("${LIBSUB_SRC_DIR}/${f}.lyx" formatlist) foreach(format "xhtml" ${formatlist}) - add_test(NAME export/autotests/${libsubfolder}/${f}_${format} + add_test(NAME export/${libsubfolder}/${f}_${format} WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}" COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${LIBSUB_SRC_DIR} -Dlyx=$<TARGET_FILE:${_lyx}> diff --git a/development/expectedTestFailures b/development/expectedTestFailures index e793b45..bd85ca5 100644 --- a/development/expectedTestFailures +++ b/development/expectedTestFailures @@ -18,11 +18,11 @@ Test Notes autotests/bug-7673 #7673 autotests/bug-8540 #8540 -autotests/export/MergedManuals_pdf #8517 -autotests/export/MergedManuals_pdf2 #8517 -autotests/export/MergedManuals_pdf5 #8517 -autotests/export/Math_pdf #8517 -autotests/export/Math_pdf2 #8517 -autotests/export/Math_pdf5 #8517 +export/doc/MergedManuals_pdf #8517 +export/doc/MergedManuals_pdf2 #8517 +export/doc/MergedManuals_pdf5 #8517 +export/doc/Math_pdf #8517 +export/doc/Math_pdf2 #8517 +export/doc/Math_pdf5 #8517 tex2lyx/roundtrip/CJKutf8.tex tex2lyx2lyx/roundtrip/CJKutf8.tex commit 010dfb6a5a00ff716b7f3c65c89b01041bb6aeb3 Author: Scott Kostyshak <[email protected]> Date: Sat Feb 16 03:02:38 2013 -0500 Make export tests more extendable For both CMake and autotools. Now we can easily add the examples to the export tests. diff --git a/development/autotests/CMakeLists.txt b/development/autotests/CMakeLists.txt index f867033..a0e06d7 100644 --- a/development/autotests/CMakeLists.txt +++ b/development/autotests/CMakeLists.txt @@ -62,28 +62,31 @@ macro(getdefaultoutputformat filepath varname) endforeach() endmacro() -file(GLOB lyx_files RELATIVE "${TOP_SRC_DIR}/lib/doc" "${TOP_SRC_DIR}/lib/doc/*.lyx") -foreach(f ${lyx_files}) - # Strip extension - string(REGEX REPLACE "\\.lyx$" "" f ${f}) - add_test(NAME autotests/export/${f}_lyx16 - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}" - COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${TOP_SRC_DIR}/lib/doc - -Dlyx=$<TARGET_FILE:${_lyx}> - -Dformat=lyx16x - -Dextension=16.lyx - -Dfile=${f} - -P "${TOP_SRC_DIR}/development/autotests/export.cmake") - getdefaultoutputformat("${TOP_SRC_DIR}/lib/doc/${f}.lyx" formatlist) - foreach(format "xhtml" ${formatlist}) - add_test(NAME autotests/export/${f}_${format} +foreach(libsubfolder doc) + set(LIBSUB_SRC_DIR "${TOP_SRC_DIR}/lib/${libsubfolder}") + file(GLOB lyx_files RELATIVE "${LIBSUB_SRC_DIR}" "${LIBSUB_SRC_DIR}/*.lyx") + foreach(f ${lyx_files}) + # Strip extension + string(REGEX REPLACE "\\.lyx$" "" f ${f}) + add_test(NAME export/autotests/${libsubfolder}/${f}_lyx16 WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}" - COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${TOP_SRC_DIR}/lib/doc - -Dlyx=$<TARGET_FILE:${_lyx}> - -Dformat=${format} - -Dextension=${format} - -Dfile=${f} - -P "${TOP_SRC_DIR}/development/autotests/export.cmake") + COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${LIBSUB_SRC_DIR} + -Dlyx=$<TARGET_FILE:${_lyx}> + -Dformat=lyx16x + -Dextension=16.lyx + -Dfile=${f} + -P "${TOP_SRC_DIR}/development/autotests/export.cmake") + getdefaultoutputformat("${LIBSUB_SRC_DIR}/${f}.lyx" formatlist) + foreach(format "xhtml" ${formatlist}) + add_test(NAME export/autotests/${libsubfolder}/${f}_${format} + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}" + COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${LIBSUB_SRC_DIR} + -Dlyx=$<TARGET_FILE:${_lyx}> + -Dformat=${format} + -Dextension=${format} + -Dfile=${f} + -P "${TOP_SRC_DIR}/development/autotests/export.cmake") + endforeach() endforeach() endforeach() diff --git a/development/autotests/export-in.sh b/development/autotests/export-in.sh index 275ee08..4757695 100755 --- a/development/autotests/export-in.sh +++ b/development/autotests/export-in.sh @@ -1,14 +1,16 @@ #!/bin/bash failed=0 -for format in xhtml lyx16x; do - for f in $LYX_ROOT/lib/doc/*lyx; do - if $LYX_EXE -e $format $f >> lyx-log.txt 2>&1; then - echo $format $f TEST_GOOD - else - echo $format $f TEST_BAD - failed=$[$failed+1]; - fi; +for libsubdir in doc; do + for format in xhtml lyx16x; do + for f in $LYX_ROOT/lib/$libsubdir/*lyx; do + if $LYX_EXE -e $format $f >> lyx-log.txt 2>&1; then + echo $format $f TEST_GOOD + else + echo $format $f TEST_BAD + failed=$[$failed+1]; + fi; + done; done; done ----------------------------------------------------------------------- Summary of changes: development/autotests/CMakeLists.txt | 45 ++++++++++++++++++---------------- development/autotests/export-in.sh | 18 +++++++------ development/expectedTestFailures | 22 ++++++++++++---- lib/examples/instant_preview.lyx | 2 +- lib/examples/powerdot-example.lyx | 2 +- 5 files changed, 52 insertions(+), 37 deletions(-) hooks/post-receive -- The LyX Source Repository
