Improve format specification for 616.

[lyx.git] / development / autotests / run-tests.sh

diff --git a/development/autotests/run-tests.sh b/development/autotests/run-tests.sh
index dd7d26dd34ef324d44643f7f2b515e320f2dc3df..25d29340e8414e8567f4ea826c458dd6926abc3b 100755 (executable)
--- a/development/autotests/run-tests.sh
+++ b/development/autotests/run-tests.sh
@@ -21,15 +21,13 @@ if [ "$(which wmctrl)" == "" ]; then
     exit -1;
 fi
 
-<<<<<<< Updated upstream
 if [ "$(which pcregrep)" == "" ]; then
     echo "You need to install pcregrep first, try:"
     echo "  sudo apt-get install pcregrep"
     exit -1;
 fi
-=======
+
 PROGRAM_SUFFIX=$(grep -e '#define PACKAGE ' ../../config.h | sed -e 's/#define PACKAGE "lyx\(.*\)"/\1/')
->>>>>>> Stashed changes
 
 export XVKBD_EXE=../$XVKBD_EXE
 export KEYTEST=../keytest.py
@@ -55,7 +53,7 @@ if [ ! -d ../../locale ]; then
 fi
 
 if [ "$#" -eq 0 ]; then
-    TESTS=$(ls *-in.txt *-in.sh | sed -e 's/hello-world-in.txt\|first-time-in.txt//')
+    TESTS=$(ls *-in.txt *-in.sh | sed -e 's/hello-world-in.txt\|first-time-in.txt\|export-in.sh//')
     rm -rf out-*;
 else
     TESTS=$*
@@ -65,7 +63,7 @@ echo
 
 if [ ! -d $LYX_HOME ]; then
     mkdir -p $LYX_HOME
-#    mkdir -p $LYX_USERDIR
+    mkdir -p $LYX_USERDIR
 #    cp preferences $LYX_USERDIR
     cd $LYX_HOME
     echo "Initializing testing environment . . ."