X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2Ftest%2FCMakeLists.txt;h=71626c23b0a16e7c3a56338b2739a3e85f1aee88;hb=9960709fc25756cce248d39ba9c99f1089d3e020;hp=c0ba51deff55da1bf9ed79b67db0f43b420d8efd;hpb=e6f2598323160dd71f9aac4fe5da76d8d6ac12f8;p=lyx.git

diff --git a/src/tex2lyx/test/CMakeLists.txt b/src/tex2lyx/test/CMakeLists.txt
index c0ba51deff..71626c23b0 100644
--- a/src/tex2lyx/test/CMakeLists.txt
+++ b/src/tex2lyx/test/CMakeLists.txt
@@ -11,16 +11,22 @@ project(test)
 #list(REMOVE_ITEM _tex_tests DummyDocument.tex)
 
 set(_tex_tests test.ltx
+               algo2e.tex
                box-color-size-space-align.tex
                CJK.tex
                CJKutf8.tex
+               test-insets-basic.tex
                test-insets.tex
+               test-memoir.tex
                test-modules.tex
                test-refstyle-theorems.tex
+               test-scr.tex
                test-structure.tex
-               verbatim.tex
                XeTeX-polyglossia.tex)
 
+set(runtestsScript "${TOP_SRC_DIR}/src/tex2lyx/test/runtests.py")
+set(scriptDir "${TOP_SRC_DIR}/lib/scripts")
+
 foreach(_fl ${_tex_tests})
   set(fl ${_fl})
   add_test(NAME tex2lyx/roundtrip/${_fl}
@@ -29,26 +35,38 @@ foreach(_fl ${_tex_tests})
       -DLYX_TESTS_USERDIR=${LYX_TESTS_USERDIR}
       -DLYX_USERDIR_VER=${LYX_USERDIR_VER}
       -DLYX_PYTHON_EXECUTABLE=${LYX_PYTHON_EXECUTABLE}
-      -DPY_SCRIPT=${TOP_SRC_DIR}/src/tex2lyx/test/runtests.py
+      -DPY_SCRIPT=${runtestsScript}
       -DTEX2LYX_EXE=$<TARGET_FILE:${_tex2lyx}>
-      -DSCRIPT_DIR=${TOP_SRC_DIR}/lib/scripts
+      -DSCRIPT_DIR=${scriptDir}
       -DWORKDIR=${CMAKE_CURRENT_BINARY_DIR}
       -DTESTFILE=${fl}
       -P ${TOP_SRC_DIR}/src/tex2lyx/test/runtests.cmake)
+  set_tests_properties(tex2lyx/roundtrip/${_fl} PROPERTIES RESOURCE_LOCK "runtests.lock" LABELS "roundtrip")
   add_test(NAME tex2lyx/cmplyx/${_fl}
     WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
     COMMAND ${CMAKE_COMMAND}
       -DLYX_TESTS_USERDIR=${LYX_TESTS_USERDIR}
       -DLYX_USERDIR_VER=${LYX_USERDIR_VER}
       -DLYX_PYTHON_EXECUTABLE=${LYX_PYTHON_EXECUTABLE}
-      -DPY_SCRIPT=${TOP_SRC_DIR}/src/tex2lyx/test/runtests.py
+      -DPY_SCRIPT=${runtestsScript}
       -DFIRST_PARAM=uselyx2lyx
       -DTEX2LYX_EXE=$<TARGET_FILE:${_tex2lyx}>
-      -DSCRIPT_DIR=${TOP_SRC_DIR}/lib/scripts
+      -DSCRIPT_DIR=${scriptDir}
       -DWORKDIR=${CMAKE_CURRENT_BINARY_DIR}
       -DTESTFILE=${fl}
       -P ${TOP_SRC_DIR}/src/tex2lyx/test/runtests.cmake)
+  set_tests_properties(tex2lyx/cmplyx/${_fl} PROPERTIES RESOURCE_LOCK "runtests.lock" LABELS "cmplyx")
 endforeach()
 
 add_dependencies(lyx_run_tests ${_tex2lyx} ${_lyx})
 
+add_custom_command(
+  OUTPUT LyxTestFiles
+  COMMAND ${CMAKE_COMMAND} -E touch LyxTestFiles
+  COMMAND env LYX_USERDIR_VER=${LYX_USERDIR_VER} 
+    ${LYX_PYTHON_EXECUTABLE} "${runtestsScript}" $<TARGET_FILE:${_tex2lyx}> "${scriptDir}" "${CMAKE_CURRENT_SOURCE_DIR}"
+  WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+  DEPENDS ${_tex2lyx} ${_lyx}
+)
+
+add_custom_target(updatetex2lyxtests DEPENDS LyxTestFiles)