From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Thu, 13 Aug 2015 18:37:14 +0000 (-0400)
Subject: Tests: Fix flacky clock-plugin test
X-Git-Tag: v2.7.0-rc2~142
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=06f49088253d2a3357d92d08a81b3d3bab725cf5;p=lttng-tools.git

Tests: Fix flacky clock-plugin test

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/tests/regression/ust/clock-override/Makefile.am b/tests/regression/ust/clock-override/Makefile.am
index a656548de..95065e0ed 100644
--- a/tests/regression/ust/clock-override/Makefile.am
+++ b/tests/regression/ust/clock-override/Makefile.am
@@ -19,8 +19,8 @@ if LTTNG_TOOLS_BUILD_WITH_LIBC_DL
 lttng_ust_clock_override_test_la_LIBADD = -lc
 endif
 
-noinst_SCRIPTS = test_clock_override run-clock-override
-EXTRA_DIST = test_clock_override run-clock-override
+noinst_SCRIPTS = test_clock_override
+EXTRA_DIST = test_clock_override
 
 all-local:
 	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
diff --git a/tests/regression/ust/clock-override/run-clock-override b/tests/regression/ust/clock-override/run-clock-override
deleted file mode 100755
index d771ecf7e..000000000
--- a/tests/regression/ust/clock-override/run-clock-override
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# launch with: run-clock-override progname args
-DIR=$(dirname $0)
-DIR=$(readlink -f $DIR)
-
-if [ -x "$DIR/.libs/lttng-ust-clock-override-test.so" ]; then
-	ret=`LTTNG_UST_CLOCK_PLUGIN="$DIR/.libs/lttng-ust-clock-override-test.so" $@`
-	exit $ret
-else
-	echo "Clock-override missing shared object"
-	exit $1
-fi
diff --git a/tests/regression/ust/clock-override/test_clock_override b/tests/regression/ust/clock-override/test_clock_override
index 445d00f9d..d462926f8 100755
--- a/tests/regression/ust/clock-override/test_clock_override
+++ b/tests/regression/ust/clock-override/test_clock_override
@@ -23,7 +23,6 @@ SESSION_NAME="clock_override"
 TESTAPP_PATH="$TESTDIR/utils/testapp"
 TESTAPP_NAME="gen-ust-events"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
-TESTAPP_WRAPPER="run-getcpu-override"
 NUM_EVENT=256
 EVENT_NAME="tp:tptest"
 LTTNG_UST_CLOCK_PLUGIN_SO="lttng-ust-clock-override-test.so"
@@ -147,11 +146,11 @@ function test_getcpu_override_timestamp()
 	diag "Plugin enabled"
 	export LTTNG_UST_CLOCK_PLUGIN=$CURDIR/.libs/$LTTNG_UST_CLOCK_PLUGIN_SO
 	start_lttng_sessiond
-	unset LTTNG_UST_CLOCK_PLUGIN
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 	enable_ust_lttng_event_ok $SESSION_NAME "$EVENT_NAME"
 	start_lttng_tracing_ok $SESSION_NAME
 	run_app
+	unset LTTNG_UST_CLOCK_PLUGIN
 	stop_lttng_tracing_ok $SESSION_NAME
 	destroy_lttng_session_ok $SESSION_NAME
 	stop_lttng_sessiond