From: Tommaso Cucinotta <tommaso@lyx.org>
Date: Wed, 13 Nov 2013 02:41:38 +0000 (+0000)
Subject: Now run-tests.sh captures PROGRAM_SUFFIX from config.h, in order to use the correct... 
X-Git-Tag: 2.1.0rc1~432
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a2291edac65fe16bf8f158150c7474e1c3480685;p=features.git

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

diff --git a/development/autotests/run-tests.sh b/development/autotests/run-tests.sh
index d2556dadc8..dd7d26dd34 100755
--- 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