X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fust%2Fhigh-throughput%2Frun;h=f86a17a14f8fd1e6015a07c6bbe00dc0fdc35ab4;hb=c38b5107fcb9435ea7584e82f6c61319a9391fc0;hp=05f8e85eab4c9f1be5effb6d8ab408b2f68ae2c8;hpb=a73616a493bb1214afd08d3b23975748b03bd713;p=lttng-tools.git

diff --git a/tests/ust/high-throughput/run b/tests/ust/high-throughput/run
index 05f8e85ea..f86a17a14 100755
--- a/tests/ust/high-throughput/run
+++ b/tests/ust/high-throughput/run
@@ -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="UST tracer - Testing high events throughput"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../..
@@ -24,9 +25,7 @@ EVENT_NAME="tp:tptest"
 
 source $TESTDIR/utils.sh
 
-echo -e "\n-------------------------------------------"
-echo -e "UST tracer - Testing high events throughput"
-echo -e "-------------------------------------------"
+print_test_banner "$TEST_DESC"
 
 if [ ! -x "$CURDIR/$BIN_NAME" ]; then
 	echo -e "No UST nevents binary detected. Passing."
@@ -48,9 +47,12 @@ for i in `seq 1 $NR_ITER`; do
 	./$CURDIR/$BIN_NAME & >/dev/null 2>&1
 done
 
-echo "Waiting for all tracing to settle (7 secs)"
-echo "Warning: this arbitrary time can make the test fail on slower system"
-sleep 7
+echo "Waiting for applications to end"
+while [ -n "$(pidof $BIN_NAME)" ]; do
+	echo -n "."
+	sleep 0.5
+done
+echo ""
 
 stop_tracing $SESSION_NAME
 destroy_lttng_session $SESSION_NAME
@@ -78,11 +80,11 @@ let wanted=$NR_ITER*1000000
 
 if [ $wanted -ne $total ]; then
 	echo -n "Expected $wanted. Dropped $dropped. Recorded $traced. Total $total... "
-	echo -e "\e[1;31mFAILED\e[0m"
+	print_fail
 	out=1
 else
 	echo -n "Expected $wanted. Dropped $dropped. Recorded $traced. Total $total... "
-	echo -e "\e[1;32mOK\e[0m"
+	print_ok
 	out=0
 fi