Am Mittwoch, 23. Januar 2019 11:54:55 CET schrieb Kornel Benko <kor...@lyx.org>: > > Alternatively, a summary of the reason to fail in the test output might > > also help the bug hunter. > > Yes, this is easier to handle. > Will check. >
Try the attached
Kornel
diff --git a/development/autotests/export.cmake b/development/autotests/export.cmake
index 5b193df..6dfefa8 100755
--- a/development/autotests/export.cmake
+++ b/development/autotests/export.cmake
@@ -29,10 +29,11 @@
# -DXMLLINT_EXECUTABLE=${XMLLINT_EXECUTABLE} \
# -DENCODING=xxx \
# -P "${TOP_SRC_DIR}/development/autotests/export.cmake"
#
+set(_TestResultMessage "")
message(STATUS "IgnoreErrorMessage = \"${IgnoreErrorMessage}\"")
set(Perl_Script "${TOP_SRC_DIR}/development/autotests/useSystemFonts.pl")
set(Structure_Script "${TOP_SRC_DIR}/development/autotests/beginEndStructureCheck.pl")
set(LanguageFile "${TOP_SRC_DIR}/lib/languages")
set(GetTempDir "${TOP_SRC_DIR}/development/autotests/getTempDir.pl")
@@ -104,41 +105,47 @@ set(ENV{LANG} "en_US.UTF-8") # to get all error-messages in english
#set(ENV{LC_ALL} "C")
if (extension MATCHES "\\.lyx$")
include(${TOP_SRC_DIR}/development/autotests/CheckLoadErrors.cmake)
get_md5sum(LYX_SOURCE source_md5sum _err)
foreach(_lv RANGE 1 20)
+ set(used_tex_file "${result_file_base}.tex")
set(result_file_base "${result_file_base}.${LYX_FORMAT_NUM}")
set(result_file_name "${result_file_base}.lyx")
file(REMOVE "${result_file_name}" "${result_file_name}.emergency" )
message(STATUS "Executing ${lyx} -userdir \"${LYX_TESTS_USERDIR}\" -E ${format} ${result_file_name} \"${LYX_SOURCE}\"")
message(STATUS "This implicitly checks load of ${LYX_SOURCE}")
execute_process(
COMMAND ${lyx} -userdir "${LYX_TESTS_USERDIR}" -E ${format} ${result_file_name} "${LYX_SOURCE}"
RESULT_VARIABLE _err
ERROR_VARIABLE lyxerr)
if(_err)
+ set(_TestResultMessage "Error: Converting \"${LYX_SOURCE}\" to format ${format}")
break()
elseif(NOT EXISTS "${result_file_name}")
message(STATUS "Expected result file \"${result_file_name}\" does not exist")
+ set(_TestResultMessage "Error: The conversion of \"${LYX_SOURCE}\" to format ${format} did not create result file \"${result_file_name}\"")
set(_err -1)
break()
else()
message(STATUS "Expected result file \"${result_file_name}\" exists")
execute_process(
COMMAND ${PERL_EXECUTABLE} ${Structure_Script} "${WORKDIR}/${result_file_name}"
RESULT_VARIABLE _err)
if(_err)
+ set(_TestResultMessage "Error: The structure of the intermediate file \"${WORKDIR}/${result_file_name}\" seems to be broken")
break()
endif()
checkLoadErrors(lyxerr "${TOP_SRC_DIR}/development/autotests" _err)
if(_err)
+ set(_TestResultMessage "Error: Examination of error/warning messages of the conversion of \"${LYX_SOURCE}\" to format ${format}")
break()
endif()
endif()
get_md5sum(result_file_name result_md5sum _err)
if(_err)
# Somehow the created file is not readable?
+ set(_TestResultMessage "Error: Getting md5sum of \"${result_file_name}\" after the conversion of \"${LYX_SOURCE}\" to format ${format}")
break()
endif()
# Check if result file identical to source file
if(result_md5sum STREQUAL ${source_md5sum})
if (format MATCHES "lyx(1[0-9]|2[01])x")
@@ -152,16 +159,20 @@ if (extension MATCHES "\\.lyx$")
message(STATUS "Executing ${lyx} -userdir \"${LYX_TESTS_USERDIR}\" -E default \"${result_file_name}.default\" \"${result_file_name}\"")
execute_process(
COMMAND ${lyx} -userdir "${LYX_TESTS_USERDIR}" -E default "${result_file_name}.default" "${result_file_name}"
RESULT_VARIABLE _err
ERROR_VARIABLE lyxerr)
+ if (_err)
+ set(_TestResultMessage "Error: Test-compilation of \"${result_file_name}\" to format default")
+ endif()
break()
else()
message(STATUS "Source(${LYX_SOURCE}) and dest(${result_file_name}) are still different")
if (_lv GREATER 10)
set(_err 1)
message(STATUS "Possible endless loop encountered")
+ set(_TestResultMessage "Error: Test-Loop exceeded the count of 10, Possible endless loop")
break()
endif()
endif()
set(source_md5sum ${result_md5sum})
set(LYX_SOURCE ${result_file_name})
@@ -225,9 +236,12 @@ if(inverted)
string(COMPARE EQUAL ${_err} 0 _erg)
else()
string(COMPARE NOTEQUAL ${_err} 0 _erg)
endif()
execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory "${TempDir}")
+if(_TestResultMessage)
+ message(STATUS "${_TestResultMessage}")
+endif()
if(_erg)
message(STATUS "Exporting ${file}.lyx to ${format}")
message(FATAL_ERROR "Export failed")
endif()
signature.asc
Description: This is a digitally signed message part.
