Re-add MergedManual test

Now that the default format is set to xhtml, there will correctly
be no LaTeX test.

diff --git a/development/autotests/CMakeLists.txt b/development/autotests/CMakeLists.txt
index 9557fad59bfb54c575968b660374a596a4c44e0f..265e40b9572be2af0ab428ee5c17682484141fca 100644 (file)
--- a/development/autotests/CMakeLists.txt
+++ b/development/autotests/CMakeLists.txt
@@ -80,31 +80,27 @@ foreach(libsubfolder doc examples templates)
     endif()
   endforeach()
   foreach(f ${nolang_lyx_files} ${lang_lyx_files})
-    if(f MATCHES "MergedManuals")
-      # we do not test (for now) the uncompilable file MergedManuals.lyx
-    else()
-      # Strip extension
-      string(REGEX REPLACE "\\.lyx$" "" f ${f})
-      add_test(NAME export/${libsubfolder}/${f}_lyx16
+    # Strip extension
+    string(REGEX REPLACE "\\.lyx$" "" f ${f})
+    add_test(NAME export/${libsubfolder}/${f}_lyx16
+      WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
+      COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${LIBSUB_SRC_DIR}
+          -Dlyx=$<TARGET_FILE:${_lyx}>
+          -Dformat=lyx16x
+          -Dextension=16.lyx
+          -Dfile=${f}
+          -P "${TOP_SRC_DIR}/development/autotests/export.cmake")
+    getdefaultoutputformat("${LIBSUB_SRC_DIR}/${f}.lyx" formatlist)
+    foreach(format "xhtml" ${formatlist})
+      add_test(NAME export/${libsubfolder}/${f}_${format}
         WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
         COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${LIBSUB_SRC_DIR}
             -Dlyx=$<TARGET_FILE:${_lyx}>
-            -Dformat=lyx16x
-            -Dextension=16.lyx
+            -Dformat=${format}
+            -Dextension=${format}
             -Dfile=${f}
             -P "${TOP_SRC_DIR}/development/autotests/export.cmake")
-      getdefaultoutputformat("${LIBSUB_SRC_DIR}/${f}.lyx" formatlist)
-      foreach(format "xhtml" ${formatlist})
-        add_test(NAME export/${libsubfolder}/${f}_${format}
-          WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
-          COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${LIBSUB_SRC_DIR}
-              -Dlyx=$<TARGET_FILE:${_lyx}>
-              -Dformat=${format}
-              -Dextension=${format}
-              -Dfile=${f}
-              -P "${TOP_SRC_DIR}/development/autotests/export.cmake")
-      endforeach()
-    endif()
+    endforeach()
   endforeach()
 endforeach()