From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Wed, 30 Sep 2015 22:41:30 +0000 (-0400)
Subject: Tests: Use stop relayd from utils.sh
X-Git-Tag: v2.12.0-rc1~813
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=839cfeecde05d745592b67838942d611cff1fae4;p=lttng-tools.git

Tests: Use stop relayd from utils.sh

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/tests/regression/tools/live/test_lttng_ust b/tests/regression/tools/live/test_lttng_ust
index b9a997058..06017d01d 100755
--- a/tests/regression/tools/live/test_lttng_ust
+++ b/tests/regression/tools/live/test_lttng_ust
@@ -34,7 +34,7 @@ TRACE_PATH=$(mktemp -d)
 
 DIR=$(readlink -f $TESTDIR)
 
-NUM_TESTS=11
+NUM_TESTS=12
 
 source $TESTDIR/utils/utils.sh
 
@@ -83,6 +83,6 @@ rm -rf $TRACE_PATH
 stop_lttng_relayd
 
 test_custom_url
-pkill $RELAYD_BIN
 
+stop_lttng_relayd
 stop_lttng_sessiond