From: Yannick Brosseau <yannick.brosseau@gmail.com>
Date: Mon, 21 Feb 2011 01:30:05 +0000 (-0500)
Subject: Use the libust.so and libustinstr-malloc.so from the build directory
X-Git-Tag: v0.12~43
X-Git-Url: http://git.lttng.org/?p=ust.git;a=commitdiff_plain;h=5f63bcb39ce2f0982a2c38148d4fca7e8acdc123

Use the libust.so and libustinstr-malloc.so from the build directory

Signed-off-by: Yannick Brosseau <yannick.brosseau@gmail.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/tests/manual_mode_tracing.sh b/tests/manual_mode_tracing.sh
index bd85083..19044ba 100755
--- a/tests/manual_mode_tracing.sh
+++ b/tests/manual_mode_tracing.sh
@@ -41,7 +41,9 @@ UST_CONSUMERD="$TESTDIR/../ust-consumerd/ust-consumerd"
 $UST_CONSUMERD --pidfile "$pidfilepath" -o "$TRACE_DIR" >/dev/null 2>&1 &
 UST_CONSUMERD_PID="$(<$pidfilepath)"
 
-LD_PRELOAD=/usr/local/lib/libust.so.0.0.0:/usr/local/lib/libustinstr-malloc.so find -L / >/dev/null 2>&1 &
+LIB_UST="$TESTDIR/../libust/.libs/libust.so.0.0.0"
+LIB_UST_MALLOC="$TESTDIR/../libustinstr-malloc/.libs/libustinstr-malloc.so"
+LD_PRELOAD="$LIB_UST:$LIB_UST_MALLOC" find -L / >/dev/null 2>&1 &
 PID=$!
 TRACE=auto
 USTCTL="$TESTDIR/../ustctl/ustctl"