Gen-ust-events: use options instead of arguments

[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 d462926f8d5d26ecee340159e4a9194772b621dd..ce5d9687a0a259fc1a40db201df0b08aa43d9fb9 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/../../..
@@ -49,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"
 }
 
@@ -80,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"
@@ -99,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
@@ -167,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"