Now run-tests.sh captures PROGRAM_SUFFIX from config.h, in order to use the correct...

diff --git a/development/autotests/run-tests.sh b/development/autotests/run-tests.sh
index d2556dadc80fd6af8524f90e648026c8e64eddec..dd7d26dd34ef324d44643f7f2b515e320f2dc3df 100755 (executable)
--- a/development/autotests/run-tests.sh
+++ b/development/autotests/run-tests.sh
@@ -21,16 +21,20 @@ 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
 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