X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fautotests%2Frun-tests.sh;h=4d4043044ebaf2d43fb0bc502d1f64fbd48017eb;hb=c7de1a4e2bfe3c3dd362a62d48d17e214614a242;hp=f61cc6e12805d0a466769ee4379ccd1b1b7dc0b4;hpb=bf5f1eb3e8d0aa0b76bd16cf859ce344378fd480;p=lyx.git

diff --git a/development/autotests/run-tests.sh b/development/autotests/run-tests.sh
index f61cc6e128..4d4043044e 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
 
@@ -91,10 +105,10 @@ for tf in $(echo "$TESTS"); do
     rm -rf "out-$t"
     mkdir "out-$t"
     cd "out-$t"
-    if "$cmd" > test-log.txt 2>&1; then
+    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 ..