On Wed, Nov 13, 2013 at 3:42 AM, Tommaso Cucinotta <[email protected]> wrote:
> commit a2291edac65fe16bf8f158150c7474e1c3480685 > Author: Tommaso Cucinotta <[email protected]> > Date: Wed Nov 13 02:41:38 2013 +0000 > > 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 d2556da..dd7d26d 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 > Something gets screwed up here. Vincent
