[PATCH] Fix a library not found error

[Francois Tigeot]

testtools/CustomTarget_uno_test.mk may fail with the "uno" binary unable
to find its needed shared libraries:

    ...
    [ build ALL ] loaded modules: testtools

    Shared object "libuno_cppu.so.3" not found, required by "uno"

The attached patch sets LD_LIBRARY_PATH to $(OUTDIR)/lib on the model of
testtools/CustomTarget_bridgetest.mk and ensures CustomTarget_uno_test.mk
succeeds in all cases.

It should be committed to -master and the -3.6 branch if possible.

-- 
Francois Tigeot
-------------- next part --------------
>From a2fee1ba5cc96bdf4a493b16897504e0e789aa07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Tigeot?= <ftigeot at wolfpond.org>
Date: Sat, 28 Jul 2012 15:32:44 +0200
Subject: [PATCH] Set LD_LIBRARY_PATH in CustomTarget_uno_test.mk

Add a LD_LIBRARY_PATH statement along the line of CustomTarget_bridgetest.mk

Without it, the test may fail with the "uno" binary unable to find needed
shared libraries such as libuno_cppu.so.3 .

Change-Id: I77c39edde25f1d3bf974ba0c535aa1931dc8a7d1
---
 testtools/CustomTarget_uno_test.mk |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/testtools/CustomTarget_uno_test.mk b/testtools/CustomTarget_uno_test.mk
index 7c8d016..01f1cdc 100644
--- a/testtools/CustomTarget_uno_test.mk
+++ b/testtools/CustomTarget_uno_test.mk
@@ -34,11 +34,12 @@ $(call gb_CustomTarget_get_target,testtools/uno_test) : \
 		$(call gb_Executable_get_target_for_build,uno) \
 		$(call gb_InternalUnoApi_get_target,bridgetest)
 	$(call gb_Helper_abbreviate_dirs,\
-		$(call gb_Executable_get_target_for_build,uno) \
-		-ro $(OUTDIR)/xml/uno_services.rdb \
-		-ro $(OUTDIR)/bin/udkapi.rdb \
-		-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb \
-		-s com.sun.star.test.bridge.BridgeTest \
-		-- com.sun.star.test.bridge.CppTestObject)
+		echo "LD_LIBRARY_PATH=$(OUTDIR)/lib" \
+		"$(call gb_Executable_get_target_for_build,uno)" \
+		"-ro $(OUTDIR)/xml/uno_services.rdb" \
+		"-ro $(OUTDIR)/bin/udkapi.rdb" \
+		"-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb" \
+		"-s com.sun.star.test.bridge.BridgeTest" \
+		"-- com.sun.star.test.bridge.CppTestObject")
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:
-- 
1.7.10.5