Re: [LyX/master] This is LyX 2.1.0beta1

[Kornel Benko]

Am Donnerstag, 18. Juli 2013 um 08:05:34, schrieb Kornel Benko <kor...@lyx.org>
> Am Mittwoch, 17. Juli 2013 um 16:05:11, schrieb Pavel Sanda <sa...@lyx.org>
> > Georg Baum wrote:
> > > > My feeling is that make - check - install is kind of standard mantra for
> > > > building autotools based stuff but I have no reference to prove it.
> > > > Certainly I can see that it's unusual that tests are explicitly disabled
> > > > on source based distribution.
> > > 
> > > If this is some standard then lets execute the test by a different 
> > > target. I 
> > > did not know about that.
> > 
> > Yep, my proposal would be:
> > 
> > - New target for our regression testing (pick any name which is convenient 
> > for you)
> > - Add some info about this into INSTALLATION/RELEASE_NOTES
> > - Perhaps add some info message into make check like
> >   If you want to have full blown test, you can run "make blabla". Note
> >   that LyX needs to be properly configured and optional 3rd party
> >   program have to be installed on your system in order to proceed.
> 
> Many tests use lyx-bin from the build-dir with own temporary userdir, so for
> them there is no need to install lyx.
> All our tests should be configured so that the tests may be run before 
> installing lyx.
> ATM I am running the tests. My lyx is de-installed.

Tests (cmake build) done. The export-tests use the default userdir, which is 
bad.
Locally I already have a patch. May I commit?
(Also 
There are still plenty of tests failing. (222 out of 1665)

> > Kornel, is this acceptable for you?
> > Pavel
> 
> Yes.
> 
        Kornel
diff --git a/development/autotests/CMakeLists.txt b/development/autotests/CMakeLists.txt
index 10abf4c..927d5a4 100644
--- a/development/autotests/CMakeLists.txt
+++ b/development/autotests/CMakeLists.txt
@@ -79,14 +79,14 @@ if(Q_WS_X11)
     foreach(_tf first-time-in.txt hello-world-in.txt ${TESTST})
       string(REGEX REPLACE "-in\\.(txt|sh)" "" _t ${_tf})
       add_test(NAME autotests/${_t}
-	WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
-	COMMAND ${CMAKE_COMMAND}
+        WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
+        COMMAND ${CMAKE_COMMAND}
         -DAUTOTEST_ROOT=${TOP_SRC_DIR}/development/autotests
         -DPO_BUILD_DIR=${TOP_BINARY_DIR}/po
         -DKEYTEST_INFILE=${_tf}
         -DBINDIR=$<TARGET_FILE_DIR:${_lyx}>
-	-DLYX=${_lyx}
-	-DWORKDIR=${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}
+        -DLYX=${_lyx}
+        -DWORKDIR=${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}
         -DKEYTEST_OUTFILE=${_t}-out.txt
         -DPACKAGE=${PACKAGE}
         -DLOCALE_DIR=${LOCALE_DIR}
@@ -135,6 +135,7 @@ foreach(libsubfolder doc examples templates)
       WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
       COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${LIBSUB_SRC_DIR}
           -Dlyx=$<TARGET_FILE:${_lyx}>
+          -DWORKDIR=${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}
           -Dformat=lyx16x
           -Dextension=16.lyx
           -Dfile=${f}
@@ -153,4 +154,3 @@ foreach(libsubfolder doc examples templates)
   endforeach()
 endforeach()
 
-
diff --git a/development/autotests/export.cmake b/development/autotests/export.cmake
index 9db0191..75ef3d6 100755
--- a/development/autotests/export.cmake
+++ b/development/autotests/export.cmake
@@ -4,7 +4,7 @@
 # Copyright (c) 2012 Kornel Benko kor...@lyx.org
 #
 #
-# LYX_ROOT  = ${TOP_SRC_DIR}/lib/doc
+# LYX_ROOT  = ${TOP_SRC_DIR}/lib/{doc,examples,templates}
 # lyx       = 
 # format    = lyx16x|xhtml
 # extension = 16.lyx|xhtml
@@ -12,6 +12,7 @@
 #
 # Script should be called like:
 # cmake -DLYX_ROOT=xxx \
+#       -DWORKDIR=${BUILD_DIR}/autotests/out-home
 #       -Dlyx=xxx \
 #       -Dformat=xxx \
 #       -Dextension=xxx \
@@ -20,6 +21,7 @@
 #
 
 message(STATUS "Executing ${lyx} -E ${format} ${file}.${extension} ${LYX_ROOT}/${file}.lyx")
+set(ENV{LYX_USERDIR} "${WORKDIR}/.lyx")
 execute_process(COMMAND ${CMAKE_COMMAND} -E remove ${file}.${extension})
 execute_process(
   COMMAND ${lyx} -E ${format} ${file}.${extension} "${LYX_ROOT}/${file}.lyx"

signature.asc
Description: This is a digitally signed message part.