X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fclock-override%2Ftest_clock_override;h=ce5d9687a0a259fc1a40db201df0b08aa43d9fb9;hp=445d00f9d48687741a27970b586973b99b61b917;hb=a4c305246c4b8021fa1681076326731349a1cd17;hpb=199800b2c98035f82a87f675e6576ceb89017674

diff --git a/tests/regression/ust/clock-override/test_clock_override b/tests/regression/ust/clock-override/test_clock_override
index 445d00f9d..ce5d9687a 100755
--- a/tests/regression/ust/clock-override/test_clock_override
+++ b/tests/regression/ust/clock-override/test_clock_override
@@ -14,7 +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 - Getcpu override plugin"
+TEST_DESC="UST - Clock override plugin"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
@@ -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"
@@ -50,14 +49,10 @@ NUM_TESTS=33
 
 source $TESTDIR/utils/utils.sh
 
-if [ ! -x "$CURDIR/$LIBS_DIR/$LTTNG_UST_CLOCK_PLUGIN_SO" ]; then
-	BAIL_OUT "No shared object generated"
-fi
-
 # MUST set TESTDIR before calling those functions
 function run_app()
 {
-	$TESTAPP_BIN $NUM_EVENT
+	$TESTAPP_BIN -i $NUM_EVENT
 	ok $? "Application done"
 }
 
@@ -81,8 +76,8 @@ function extract_clock_metadata_token()
 
 function test_getcpu_override_metadata()
 {
-	local ctf_metadata_file=$(mktemp -p $TRACE_PATH ctf-metadata.XXXXX)
-	local clock_metadata_file=$(mktemp -p $TRACE_PATH clock-metadata.XXXXX)
+	local ctf_metadata_file=$(mktemp -p $TRACE_PATH ctf-metadata.XXXXXX)
+	local clock_metadata_file=$(mktemp -p $TRACE_PATH clock-metadata.XXXXXX)
 	local result=""
 
 	diag "Clock override plugin metadata test"
@@ -100,7 +95,10 @@ function test_getcpu_override_metadata()
 	destroy_lttng_session_ok $SESSION_NAME
 	stop_lttng_sessiond
 
-	$BABELTRACE_BIN -o ctf-metadata -w $ctf_metadata_file $TRACE_PATH
+	local TRACE_METADATA_FILE_PATH="$(find "$TRACE_PATH" -name metadata -type f)"
+	local TRACE_METADATA_DIR="$(dirname "$TRACE_METADATA_FILE_PATH")"
+
+	$BABELTRACE_BIN -o ctf-metadata -w $ctf_metadata_file $TRACE_METADATA_DIR
 	ok $? "Metadata extraction from babeltrace"
 
 	extract_clock_metadata $ctf_metadata_file $clock_metadata_file
@@ -147,11 +145,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
@@ -168,6 +166,14 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+if [ -x "$CURDIR/$LIBS_DIR/$LTTNG_UST_CLOCK_PLUGIN_SO" ]; then
+	foundobj=1
+else
+	foundobj=0
+fi
+
+skip $foundobj "No shared object generated. Skipping all tests." $NUM_TESTS && exit 0
+
 TESTS=(
 	"test_getcpu_override_metadata"
 	"test_getcpu_override_timestamp"