ctests: address some test failures.

[lyx.git] / development / autotests / lyx2lyxtest.cmake

diff --git a/development/autotests/lyx2lyxtest.cmake b/development/autotests/lyx2lyxtest.cmake
index d5007ea5ffef0869d2060acbba84f2361d3aa449..708cd5077d73307547d39862cc9463aa9377dc09 100755 (executable)
--- a/development/autotests/lyx2lyxtest.cmake
+++ b/development/autotests/lyx2lyxtest.cmake
@@ -8,7 +8,8 @@
 # LYXFILE  = xxx
 #
 # Script should be called like:
-# cmake -DLYX2LYX=xxx \
+# cmake -DLYX_PYTHON_EXECUTABLE=xxx \
+#       -DLYX2LYX=xxx \
 #       -DLYX_TESTS_USERDIR=${LYX_TESTS_USERDIR} \
 #       -DWORKDIR=${BUILD_DIR}/autotests/out-home \
 #       -DLYXFILE=xxx \
@@ -17,9 +18,9 @@
 
 string(RANDOM LENGTH 5 errorfile)
 string(RANDOM LENGTH 6 outputfile)
-message(STATUS "Executing ${LYX2LYX} -e ${errorfile} -o ${outputfile} ${LYXFILE}")
+message(STATUS "Executing ${LYX_PYTHON_EXECUTABLE} ${LYX2LYX} -e ${errorfile} -o ${outputfile} ${LYXFILE}")
 execute_process(
-  COMMAND ${LYX2LYX} -e ${errorfile} -o ${outputfile} ${LYXFILE}
+  COMMAND ${LYX_PYTHON_EXECUTABLE} ${LYX2LYX} -e ${errorfile} -o ${outputfile} ${LYXFILE}
   RESULT_VARIABLE _err)
 
 message(STATUS "Error output of lyx2lyx = ${_err}")
@@ -28,9 +29,11 @@ string(COMPARE NOTEQUAL  ${_err} 0 _erg)
 # Check file "errors" being empty
 file(STRINGS ${errorfile} foundErrors)
 if(foundErrors)
-  set(_erg 1)
   foreach(_l ${foundErrors})
-    message(STATUS "${_l}")
+    if (NOT _l MATCHES "Warning: No conversion needed:")
+      set(_erg 1)
+      message(STATUS "${_l}")
+  endif()
   endforeach()
 endif()