tex2lyx tests adapted to cmake build

diff --git a/src/tex2lyx/test/CMakeLists.txt b/src/tex2lyx/test/CMakeLists.txt
index 196a1937cf7bb441bf86c4b7984ac5e631570a51..ab03c82e2a87537f1d5fc15b56c512577b6f7396 100644 (file)
--- a/src/tex2lyx/test/CMakeLists.txt
+++ b/src/tex2lyx/test/CMakeLists.txt
@@ -6,19 +6,14 @@
 
 project(test)
 
-set(_test_depend "${CMAKE_CURRENT_BINARY_DIR}/test.ltx")
-set(_test_output "${CMAKE_CURRENT_BINARY_DIR}/test.lyx.tex")
-foreach(_arg runtests.py DummyDocument.tex test.ltx foo.eps foo.png)
-  configure_file("${TOP_SRC_DIR}/src/tex2lyx/test/${_arg}" "${CMAKE_CURRENT_BINARY_DIR}/${_arg}" COPYONLY)
-endforeach(_arg)
+set(_test_depend "test.ltx")
+set(_test_output)
+#foreach(_arg runtests.py DummyDocument.tex test.ltx foo.eps foo.png)
+#  configure_file("${TOP_SRC_DIR}/src/tex2lyx/test/${_arg}" "${CMAKE_CURRENT_BINARY_DIR}/${_arg}" COPYONLY)
+#endforeach(_arg)
 
 foreach(_arg test-structure test-insets box-color-size-space-align CJK XeTeX-polyglossia)
-  add_custom_command(
-    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_arg}.tex"
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different "${TOP_SRC_DIR}/src/tex2lyx/test/${_arg}.tex" "${CMAKE_CURRENT_BINARY_DIR}/${_arg}.tex"
-    DEPENDS "${TOP_SRC_DIR}/src/tex2lyx/test/${_arg}.tex"
-    )
-  list(APPEND _test_depend "${CMAKE_CURRENT_BINARY_DIR}/${_arg}.tex")
+  list(APPEND _test_depend "${TOP_SRC_DIR}/src/tex2lyx/test/${_arg}.tex")
   list(APPEND _test_output "${CMAKE_CURRENT_BINARY_DIR}/${_arg}.lyx.tex")
   list(APPEND _test_output "${CMAKE_CURRENT_BINARY_DIR}/${_arg}.lyx.lyx")
 endforeach(_arg)
@@ -26,10 +21,10 @@ endforeach(_arg)
 ADD_CUSTOM_COMMAND(
   OUTPUT ${_test_output}
   COMMAND ${LYX_PYTHON_EXECUTABLE}
-  ARGS "${CMAKE_CURRENT_BINARY_DIR}/runtests.py" "${TOP_BINARY_DIR}/bin/${_tex2lyx}" "${TOP_SRC_DIR}/lib/scripts"
+  ARGS "${TOP_SRC_DIR}/src/tex2lyx/test/runtests.py" "${TOP_BINARY_DIR}/bin/${_tex2lyx}" "${TOP_SRC_DIR}/lib/scripts" "${CMAKE_CURRENT_BINARY_DIR}"
   WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
   DEPENDS ${_tex2lyx} ${_test_depend}
-  COMMENT "${LYX_PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}/runtests.py" "${TOP_BINARY_DIR}/bin/${_tex2lyx}" "${TOP_SRC_DIR}/lib/scripts"
+  COMMENT "${LYX_PYTHON_EXECUTABLE}" "${TOP_SRC_DIR}/src/tex2lyx/test/runtests.py" "${TOP_BINARY_DIR}/bin/${_tex2lyx}" "${TOP_SRC_DIR}/lib/scripts" "${CMAKE_CURRENT_BINARY_DIR}"
 )
 
 ADD_CUSTOM_TARGET(test DEPENDS ${_tex2lyx} ${_lyx} ${_test_output})