Markers: Namespace cleanup, with API change.

[ust.git] / tests / manual_mode_tracing.sh

diff --git a/tests/manual_mode_tracing.sh b/tests/manual_mode_tracing.sh
index 3f203b1c8d8ecd1636ae7050759bb7add0438bd4..19044ba0fb2b45b9333ac27040f9d521b5e6b3fa 100755 (executable)
--- a/tests/manual_mode_tracing.sh
+++ b/tests/manual_mode_tracing.sh
@@ -34,27 +34,32 @@ TRACE_DIR="/tmp/ust-testsuite-manual-trace"
 rm -rf "$TRACE_DIR"
 mkdir "$TRACE_DIR"
 
-pidfilepath="/tmp/ust-testsuite-$USER-$(date +%Y%m%d%H%M%S%N)-ustd-pid"
+pidfilepath="/tmp/ust-testsuite-$USER-$(date +%Y%m%d%H%M%S%N)-ust-consumerd-pid"
 mkfifo -m 0600 "$pidfilepath"
 
-ustd --pidfile "$pidfilepath" -o "$TRACE_DIR" >/dev/null 2>&1 &
-USTD_PID="$(<$pidfilepath)"
+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"
 sleep 0.1
-okx ustctl --list-markers "$PID"
-okx ustctl --enable-marker ust/malloc $PID
-okx ustctl --enable-marker ust/free $PID
-okx ustctl --create-trace $PID
-okx ustctl --alloc-trace $PID
-okx ustctl --start-trace $PID
+okx $USTCTL list-markers $PID
+okx $USTCTL enable-marker $PID $TRACE ust/malloc
+okx $USTCTL enable-marker $PID $TRACE ust/free
+okx $USTCTL create-trace $PID $TRACE
+okx $USTCTL alloc-trace $PID $TRACE
+okx $USTCTL start-trace $PID $TRACE
 sleep 0.5
 
-okx ustctl --stop-trace $PID
-okx ustctl --destroy-trace $PID
+okx $USTCTL stop-trace $PID $TRACE
+okx $USTCTL destroy-trace $PID $TRACE
 kill $PID
-kill -SIGTERM $USTD_PID
-wait $USTD_PID
+kill -SIGTERM ${UST_CONSUMERD_PID}
+wait ${UST_CONSUMERD_PID}
 
 trace_matches -N "ust.malloc" "^ust.malloc:" "$TRACE_DIR"