Cmake build: Prepare lyx2lyx tests to use the python executable found at configure...

diff --git a/development/autotests/CMakeLists.txt b/development/autotests/CMakeLists.txt
index 9f07748d7483b5a61e967961a4f4b0d3668a3850..76ab043a4a28bb6e6474d9a993191c6a44707ee6 100644 (file)
--- a/development/autotests/CMakeLists.txt
+++ b/development/autotests/CMakeLists.txt
@@ -192,16 +192,21 @@ foreach(libsubfolder doc examples templates)
             -P "${TOP_SRC_DIR}/development/autotests/export.cmake")
       setmarkedtestlabel(${TestName} ${reverted} "export")
     endif()
-    set(TestName "lyx2lyx/${libsubfolder}/${f}")
-    maketestname(TestName reverted revertedTests ignoredTests)
-    if(TestName)
-      add_test(NAME ${TestName}
-        WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
-        COMMAND ${CMAKE_COMMAND} -DLYX2LYX=${TOP_SRC_DIR}/lib/lyx2lyx/lyx2lyx
-          -DLYX_TESTS_USERDIR=${LYX_TESTS_USERDIR}
-          -DLYXFILE=${LIBSUB_SRC_DIR}/${f}.lyx
-          -P "${TOP_SRC_DIR}/development/autotests/lyx2lyxtest.cmake")
-      setmarkedtestlabel(${TestName} ${reverted} "export")
+    if(LYX_PYTHON_EXECUTABLE)
+      # For use of lyx2lyx we need the python executable
+      set(TestName "lyx2lyx/${libsubfolder}/${f}")
+      maketestname(TestName reverted revertedTests ignoredTests)
+      if(TestName)
+        add_test(NAME ${TestName}
+          WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
+          COMMAND ${CMAKE_COMMAND}
+            "-DLYX_PYTHON_EXECUTABLE=${LYX_PYTHON_EXECUTABLE}"
+            "-DLYX2LYX=${TOP_SRC_DIR}/lib/lyx2lyx/lyx2lyx"
+            "-DLYX_TESTS_USERDIR=${LYX_TESTS_USERDIR}"
+            "-DLYXFILE=${LIBSUB_SRC_DIR}/${f}.lyx"
+            -P "${TOP_SRC_DIR}/development/autotests/lyx2lyxtest.cmake")
+        setmarkedtestlabel(${TestName} ${reverted} "export")
+      endif()
     endif()
     set(TestName "check_load/${libsubfolder}/${f}")
     maketestname(TestName reverted revertedTests ignoredTests)

diff --git a/development/autotests/lyx2lyxtest.cmake b/development/autotests/lyx2lyxtest.cmake
index d5007ea5ffef0869d2060acbba84f2361d3aa449..0e1bda41a280412bce66aff8f85a4ea9190f5bc5 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}")