X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fgetcpu-override%2Ftest_getcpu_override;h=75a3d6d4daf0335418a6d0e64373ec9abbc30a99;hp=f140eeaed2e6b1e686c8cb3f57810e4629d804f9;hb=a4c305246c4b8021fa1681076326731349a1cd17;hpb=fb7767e02f8f8d126153786073497440a8065ea9;ds=sidebyside

diff --git a/tests/regression/ust/getcpu-override/test_getcpu_override b/tests/regression/ust/getcpu-override/test_getcpu_override
index f140eeaed..75a3d6d4d 100755
--- a/tests/regression/ust/getcpu-override/test_getcpu_override
+++ b/tests/regression/ust/getcpu-override/test_getcpu_override
@@ -50,23 +50,19 @@ source $TESTDIR/utils/utils.sh
 # Equivalent to the syconf(_SC_NPROCESSORS_CONF) call.
 num_cpus=$(conf_proc_count)
 
-if [ ! -x "$CURDIR/.libs/lttng-ust-getcpu-override-test.so" ]; then
-	BAIL_OUT "No shared object generated"
-fi
-
 # MUST set TESTDIR before calling those functions
 
 run_app()
 {
 	diag "Launching app without getcpu-plugin wrapper"
-	$TESTAPP_BIN $NUM_EVENT $EVENT_WAIT_USEC
+	$TESTAPP_BIN -i $NUM_EVENT -w $EVENT_WAIT_USEC
 	ok $? "Application without wrapper done"
 }
 
 run_getcpu_plugin_app()
 {
 	diag "Launching app with getcpu-plugin wrapper"
-	$CURDIR/$TESTAPP_WRAPPER $TESTAPP_BIN $NUM_EVENT $EVENT_WAIT_USEC
+	$CURDIR/$TESTAPP_WRAPPER $TESTAPP_BIN -i $NUM_EVENT -w $EVENT_WAIT_USEC
 	ok $? "Application with wrapper done"
 }
 
@@ -161,6 +157,14 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+if [ -x "$CURDIR/.libs/lttng-ust-getcpu-override-test.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_fail
 	test_getcpu_override