From 4220447f0da99137988996426442866380c03b0a Mon Sep 17 00:00:00 2001
From: Christian Babeux <christian.babeux@efficios.com>
Date: Thu, 21 Feb 2013 22:48:19 -0500
Subject: [PATCH] Tests: Convert the UST nprocesses test output to TAP

Signed-off-by: Christian Babeux <christian.babeux@efficios.com>
---
 tests/regression/ust/nprocesses/Makefile.am   |  4 +-
 .../regression/ust/nprocesses/test_nprocesses | 51 ++++++++++++--
 .../regression/ust/nprocesses/ust-nprocesses  | 69 -------------------
 3 files changed, 48 insertions(+), 76 deletions(-)
 delete mode 100755 tests/regression/ust/nprocesses/ust-nprocesses

diff --git a/tests/regression/ust/nprocesses/Makefile.am b/tests/regression/ust/nprocesses/Makefile.am
index 63a320954..3113a344c 100644
--- a/tests/regression/ust/nprocesses/Makefile.am
+++ b/tests/regression/ust/nprocesses/Makefile.am
@@ -12,5 +12,5 @@ noinst_PROGRAMS = gen-events-time
 gen_events_time_SOURCES = gen-events-time.c tp.c ust_gen_event.h
 gen_events_time_LDADD = -llttng-ust
 
-noinst_SCRIPTS = test_nprocesses ust-nprocesses
-EXTRA_DIST = test_nprocesses ust-nprocesses
+noinst_SCRIPTS = test_nprocesses
+EXTRA_DIST = test_nprocesses
diff --git a/tests/regression/ust/nprocesses/test_nprocesses b/tests/regression/ust/nprocesses/test_nprocesses
index 55ad14811..e89d02e58 100755
--- a/tests/regression/ust/nprocesses/test_nprocesses
+++ b/tests/regression/ust/nprocesses/test_nprocesses
@@ -20,22 +20,63 @@ TEST_DESC="UST tracer - Generate $NR_ITER process"
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
 TEST_BIN_NAME="gen-events-time"
+SESSION_NAME="ust-nprocesses"
+EVENT_NAME="ust_gen_event:tptest"
+TEST_WAIT_SEC=5
+NUM_TESTS=9
 
 source $TESTDIR/utils/utils.sh
 
 print_test_banner "$TEST_DESC"
 
 if [ ! -x "$CURDIR/$TEST_BIN_NAME" ]; then
-	echo -e "No UST $TEST_BIN_NAME binary detected. Passing."
-	exit 0
+	BAIL_OUT "No UST $TEST_BIN_NAME binary detected."
 fi
 
 # MUST set TESTDIR before calling those functions
 
+plan_tests $NUM_TESTS
+
 start_lttng_sessiond
 
-./$CURDIR/ust-nprocesses $NR_ITER
+# Start test for 1000 seconds
 
-stop_lttng_sessiond
+for i in `seq 1 $NR_ITER`
+do
+	./$CURDIR/$TEST_BIN_NAME 1000 >/dev/null 2>&1 &
+done
+
+sleep 3
+
+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
+	fail "Trace validation"
+	diag "$reg_app_count apps listed. Expected $NR_ITER "
+else
+	pass "Trace validation"
+fi
+
+TRACE_PATH=$(mktemp -d)
+
+create_lttng_session $SESSION_NAME $TRACE_PATH
+
+enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
+start_lttng_tracing $SESSION_NAME
 
-exit 0
+diag "Sleeping $TEST_WAIT_SEC seconds for tracing to start everywhere"
+diag "Warning: this arbitrary time can make the test fail on slower system"
+
+sleep $TEST_WAIT_SEC
+
+stop_lttng_tracing $SESSION_NAME
+destroy_lttng_session $SESSION_NAME
+
+rm -rf $TRACE_PATH
+
+# Send SIGPIPE to 'silence' bash process status such as "Process as terminated"
+killall -s PIPE -q $TEST_BIN_NAME >/dev/null 2>&1
+
+pass "Kill all spawned applications"
+
+stop_lttng_sessiond
diff --git a/tests/regression/ust/nprocesses/ust-nprocesses b/tests/regression/ust/nprocesses/ust-nprocesses
deleted file mode 100755
index e1d3fc6bc..000000000
--- a/tests/regression/ust/nprocesses/ust-nprocesses
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) - 2012 David Goulet <dgoulet@efficios.com>
-#
-# This library is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation; version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
-# details.
-#
-# 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
-
-CURDIR=$(dirname $0)/
-TESTDIR=$CURDIR/../../..
-NR_ITER=$1
-TEST_BIN_NAME="gen-events-time"
-SESSION_NAME="ust-nprocesses"
-EVENT_NAME="ust_gen_event:tptest"
-TEST_WAIT_SEC=5
-
-source $TESTDIR/utils/utils.sh
-
-# MUST set TESTDIR before calling those functions
-
-# Start test for 1000 seconds
-
-for i in `seq 1 $NR_ITER`
-do
-	./$CURDIR/$TEST_BIN_NAME 1000 >/dev/null 2>&1 &
-done
-
-echo -n "Validating registered apps in 3 seconds..."
-
-sleep 3
-
-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 "
-	print_fail
-else
-	print_ok
-fi
-
-TRACE_PATH=$(mktemp -d)
-
-create_lttng_session $SESSION_NAME $TRACE_PATH
-
-enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
-start_lttng_tracing $SESSION_NAME
-
-echo "Sleeping $TEST_WAIT_SEC seconds for tracing to start everywhere"
-echo "Warning: this arbitrary time can make the test fail on slower system"
-sleep $TEST_WAIT_SEC
-
-stop_lttng_tracing $SESSION_NAME
-destroy_lttng_session $SESSION_NAME
-
-rm -rf $TRACE_PATH
-
-echo -e -n "Killing all spawned applications..."
-killall -q $TEST_BIN_NAME >/dev/null 2>&1 &
-print_ok
-exit 0
-- 
2.34.1