Deprecate enable/disable-consumer

[lttng-tools.git] / tests / tools / streaming / run-kernel

diff --git a/tests/tools/streaming/run-kernel b/tests/tools/streaming/run-kernel
index 73a99de158a070ccef6f95cbdb1b9d5953b260dd..545cae7c825b605f01c034712041b36b490be5bb 100755 (executable)
--- a/tests/tools/streaming/run-kernel
+++ b/tests/tools/streaming/run-kernel
@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+TEST_DESC="Streaming - Kernel tracing"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../..
@@ -25,9 +26,7 @@ TRACE_PATH=$(mktemp -d)
 
 source $TESTDIR/utils.sh
 
-echo -e "\n---------------------------"
-echo -e " Streaming - Kernel tracing "
-echo -e "----------------------------"
+print_test_banner "$TEST_DESC"
 
 if [ "$(id -u)" != "0" ]; then
        echo "This test must be running as root. Aborting"
@@ -44,43 +43,38 @@ if [ -z "$out" ]; then
        exit 0
 fi
 
-function lttng_create_session
+function lttng_create_session_uri
 {
        echo -n "Creating session $SESSION_NAME... "
        # Create session with default path
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME >/dev/null 2>&1
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME -U net://localhost >/dev/null 2>&1
        if [ $? -eq 1 ]; then
-               echo -e '\e[1;31mFAILED\e[0m'
+               print_fail
                return 1
        else
-               echo -e "\e[1;32mOK\e[0m"
-       fi
-}
-
-function lttng_enable_consumer_localhost
-{
-       echo -n "Enabling network consumer... "
-       # Create session with default path
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-consumer -k net://localhost >/dev/null 2>&1
-       if [ $? -eq 1 ]; then
-               echo -e '\e[1;31mFAILED\e[0m'
-               return 1
-       else
-               echo -e "\e[1;32mOK\e[0m"
+               print_ok
        fi
 }
 
 function test_kernel_before_start ()
 {
        echo -e "\n=== Testing kernel streaming with event enable BEFORE start\n"
-       lttng_create_session
-       lttng_enable_consumer_localhost
+       lttng_create_session_uri
        lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME
-       start_tracing $SESSION_NAME
+       start_lttng_tracing $SESSION_NAME
        # Give a second
        sleep 1
-       stop_tracing $SESSION_NAME
+       stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
+
+       # We can not predict _yet_ when the trace is available so we have to do a
+       # arbitratry sleep to validate the trace.
+       echo -n "Waiting 3 seconds for the trace to be written on disk "
+       for i in `seq 1 3`; do
+               echo -n "."
+               sleep 1
+       done
+       echo ""
 }
 
 # Deactivated since this feature is not yet available where we can enable
@@ -88,18 +82,17 @@ function test_kernel_before_start ()
 function test_kernel_after_start ()
 {
        echo -e "\n=== Testing kernel streaming with event enable AFTER start\n"
-       lttng_create_session
-       lttng_enable_consumer_localhost
-       start_tracing $SESSION_NAME
+       lttng_create_session_uri
+       start_lttng_tracing $SESSION_NAME
        lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME
        # Give a second
        sleep 1
-       stop_tracing $SESSION_NAME
+       stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 }
 
-start_sessiond
-lttng_start_relayd "-o $TRACE_PATH"
+start_lttng_sessiond
+start_lttng_relayd "-o $TRACE_PATH"
 
 tests=( test_kernel_before_start )
 
@@ -119,8 +112,8 @@ do
 done
 
 echo ""
-stop_sessiond
-lttng_stop_relayd
+stop_lttng_sessiond
+stop_lttng_relayd
 
 
 exit $out