X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fautotests%2Frun-tests.sh;h=25d29340e8414e8567f4ea826c458dd6926abc3b;hb=cb3922093016875404aedc6d1fcf2e088944b5c9;hp=b1ddf6ea0c9e298d0e177495f16f3de60e9f4f4c;hpb=db592baf0e4eaa05e034fb92314c2aa4886f79aa;p=lyx.git

diff --git a/development/autotests/run-tests.sh b/development/autotests/run-tests.sh
index b1ddf6ea0c..25d29340e8 100755
--- a/development/autotests/run-tests.sh
+++ b/development/autotests/run-tests.sh
@@ -15,10 +15,24 @@ if [ "$XVKBD_HACKED" != "" ]; then
     fi
 fi
 
+if [ "$(which wmctrl)" == "" ]; then
+    echo "You need to install wmctrl first, try:"
+    echo "  sudo apt-get install wmctrl"
+    exit -1;
+fi
+
+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/')
+
 export XVKBD_EXE=../$XVKBD_EXE
 export KEYTEST=../keytest.py
 LYX_HOME=out-home
-export LYX_USERDIR=$(pwd)/$LYX_HOME/.lyx
+export LYX_USERDIR=$(pwd)/$LYX_HOME/.lyx$PROGRAM_SUFFIX
 # Create locale links 
 export LOCALE_DIR=../locale
 
@@ -39,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=$*
@@ -49,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 . . ."
@@ -94,7 +108,7 @@ for tf in $(echo "$TESTS"); do
     if $cmd > test-log.txt 2>&1; then
 	echo Ok
 	cd ..
-	rm -rf "out-$t";
+	if [ "$V" != "" ]; then rm -rf "out-$t"; fi
     else
 	echo FAILED
 	cd ..