From 362e2a1cc1d91634b414ddab2edb77faa1363e4f Mon Sep 17 00:00:00 2001 From: Christian Babeux Date: Thu, 21 Feb 2013 22:45:42 -0500 Subject: [PATCH] Tests: Convert the UST low-throughput test output to TAP Signed-off-by: Christian Babeux --- .../ust/low-throughput/test_low_throughput | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/tests/regression/ust/low-throughput/test_low_throughput b/tests/regression/ust/low-throughput/test_low_throughput index 2e111336e..197210afe 100755 --- a/tests/regression/ust/low-throughput/test_low_throughput +++ b/tests/regression/ust/low-throughput/test_low_throughput @@ -21,20 +21,22 @@ TESTDIR=$CURDIR/../../.. BIN_NAME="gen-events" SESSION_NAME="low-throughput" EVENT_NAME="tp:slow" +NUM_TESTS=8 source $TESTDIR/utils/utils.sh print_test_banner "$TEST_DESC" if [ ! -x "$CURDIR/$BIN_NAME" ]; then - echo -e "No UST nevents binary detected. Passing." - exit 0 + BAIL_OUT "No UST nevents binary detected." fi TRACE_PATH=$(mktemp -d) # MUST set TESTDIR before calling those functions +plan_tests $NUM_TESTS + start_lttng_sessiond create_lttng_session $SESSION_NAME $TRACE_PATH @@ -65,7 +67,7 @@ do ((last_val++)) # We expect here a continous value from 1 to 20 if [ $last_val -ne $val ]; then - echo -n "[-] One minute event failed ($val) " + diag "One minute event failed ($val)" out=1 break fi @@ -74,7 +76,7 @@ do if [ $val -ne 10 ]; then # Test 20 minutes counter if [ $val -ne 20 ]; then - echo -n "[-] Ten minutes event failed ($val) " + diag "Ten minutes event failed ($val)" out=1 break fi @@ -82,20 +84,13 @@ do elif [ $th = '"twenty"' ]; then # Test 20 minutes counter if [ $val -ne 20 ]; then - echo -n "[-] Twenty minutes event failed ($val) " + diag "Twenty minutes event failed ($val)" out=1 break fi fi done -if [ $out -eq 0 ]; then - echo -n "Trace is coherent... " - print_ok -else - print_fail -fi +ok $out "Trace validation" rm -rf $TRACE_PATH - -exit $out -- 2.34.1