From adf28dcfada665a774c46e752e9b9e051e451489 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Mon, 11 May 2015 01:12:58 +0200 Subject: [PATCH] Fix the "Dummy.h" test It failed for not finding the libApp library. It will probably fail again on platforms that do not support LD_LIBRARY_PATH. --- tests/project.conf | 1 - tools/appbroker.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/project.conf b/tests/project.conf index 35e079e..29957bc 100644 --- a/tests/project.conf +++ b/tests/project.conf @@ -8,7 +8,6 @@ dist=Makefile,tests.sh [Dummy.h] type=script -#FIXME breaks when OBJDIR is set script=../tools/appbroker.sh -O APPBROKER=../tools/AppBroker depends=../data/Dummy.interface,../tools/appbroker.sh diff --git a/tools/appbroker.sh b/tools/appbroker.sh index 77d823e..6ab2e33 100755 --- a/tools/appbroker.sh +++ b/tools/appbroker.sh @@ -70,4 +70,4 @@ target="$1" source="${target#$OBJDIR}" APPINTERFACE="${source##*/}" APPINTERFACE="../data/${APPINTERFACE%%.h}.interface" -$APPBROKER -o "$target" "$APPINTERFACE" +LD_LIBRARY_PATH="${OBJDIR}../src" $APPBROKER -o "$target" "$APPINTERFACE"