Fix: tests: skip tests on static build

[lttng-tools.git] / tests / regression / ust / clock-override / test_clock_override

diff --git a/tests/regression/ust/clock-override/test_clock_override b/tests/regression/ust/clock-override/test_clock_override
index 445d00f9d48687741a27970b586973b99b61b917..722e7315849f6763893a46215f931d736582d18b 100755 (executable)
--- 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,10 +49,6 @@ 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()
 {
@@ -147,11 +142,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 +163,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"