X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fust-nprocesses%2Frun;h=20f769afdefcec9facfe7a88ca56da5a00eefcec;hp=dcaa379ed1e8f4397d1fb249fcd39c3a9582c536;hb=82541c3400f9568835938b7c2c6ce5e18b5817c0;hpb=b6ca8ef5adf433f7f0bbd4bb4858146ef25cd4fd

diff --git a/tests/ust-nprocesses/run b/tests/ust-nprocesses/run
index dcaa379ed..20f769afd 100755
--- a/tests/ust-nprocesses/run
+++ b/tests/ust-nprocesses/run
@@ -15,13 +15,13 @@
 # along with this library; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
-TESTDIR=$(dirname $0)/..
+CURDIR=$(dirname $0)/
+TESTDIR=$CURDIR/..
 NR_ITER=100
 TEST_BIN_NAME="gen-events-time"
 SESSION_NAME="ust-nprocesses"
 EVENT_NAME="ust_gen_event:tptest"
-TRACE_PATH=$(mktemp -d)
-TEST_WAIT_SEC=3
+TEST_WAIT_SEC=5
 
 source $TESTDIR/utils.sh
 
@@ -29,18 +29,23 @@ echo -e "\n-------------------------------------"
 echo -e "UST tracer - Generate $NR_ITER process"
 echo -e "---------------------------------------"
 
+if [ ! -e "$CURDIR/$TEST_BIN_NAME" ]; then
+	echo -e "No UST $TEST_BIN_NAME binary detected. Passing."
+	exit 0
+fi
+
 # MUST set TESTDIR before calling those functions
 
 # Start test for 1000 seconds
 
 for i in `seq 1 $NR_ITER`
 do
-	./$(dirname $0)/$TEST_BIN_NAME 1000 >/dev/null 2>&1 &
+	./$CURDIR/$TEST_BIN_NAME 1000 >/dev/null 2>&1 &
 done
 
 echo -n "Validating registered apps: "
 
-listing=$($TESTDIR/../lttng/$LTTNG_BIN list -u)
+listing=$($TESTDIR/../src/bin/lttng/$LTTNG_BIN list -u)
 reg_app_count=$(echo -n $listing | sed "s/$TEST_BIN_NAME/$TEST_BIN_NAME\n/g" | grep "$TEST_BIN_NAME" | wc -l)
 if [ "$reg_app_count" -ne "$NR_ITER" ]; then
 	echo -e "$reg_app_count apps listed. Expected $NR_ITER \e[1;31mFAILED\e[0m"
@@ -48,6 +53,8 @@ else
 	echo -e "\e[1;32mOK\e[0m"
 fi
 
+TRACE_PATH=$(mktemp -d)
+
 create_lttng_session $SESSION_NAME $TRACE_PATH
 
 enable_ust_lttng_event $SESSION_NAME $EVENT_NAME