From c659e81ef4eff47245646da26cb54b03d7d41a27 Mon Sep 17 00:00:00 2001 From: Francis Deslauriers Date: Thu, 10 Nov 2016 15:26:35 -0500 Subject: [PATCH] Fix: test cases now rely on explicit workloads MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Run a process explicitly in the tracing session to generate the enabled events rather than relying on the events generated by the lttng CLI. Signed-off-by: Francis Deslauriers Signed-off-by: Jérémie Galarneau --- tests/regression/kernel/test_all_events | 6 ++++++ tests/regression/kernel/test_event_basic | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/tests/regression/kernel/test_all_events b/tests/regression/kernel/test_all_events index 50002f4d9..713c717ff 100755 --- a/tests/regression/kernel/test_all_events +++ b/tests/regression/kernel/test_all_events @@ -21,6 +21,8 @@ CURDIR=$(dirname $0)/ TESTDIR=$CURDIR/../.. NUM_TESTS=8 +TESTCMD="/bin/true" + source $TESTDIR/utils/utils.sh function test_all_event() @@ -33,6 +35,10 @@ function test_all_event() lttng_enable_kernel_event $SESSION_NAME start_lttng_tracing_ok + + # Running a process and waiting for its completion forces the triggering of a + # sched_switch event + eval ${TESTCMD} stop_lttng_tracing_ok validate_trace "sched_switch" $TRACE_PATH diff --git a/tests/regression/kernel/test_event_basic b/tests/regression/kernel/test_event_basic index aeca02b68..1a10a2ce2 100755 --- a/tests/regression/kernel/test_event_basic +++ b/tests/regression/kernel/test_event_basic @@ -21,6 +21,8 @@ CURDIR=$(dirname $0)/ TESTDIR=$CURDIR/../.. NUM_TESTS=20 +TESTCMD="/bin/true" + source $TESTDIR/utils/utils.sh function test_event_basic() @@ -32,14 +34,18 @@ function test_event_basic() lttng_enable_kernel_event $SESSION_NAME "sched_switch" lttng_enable_kernel_event $SESSION_NAME "sched_process_exit" - lttng_enable_kernel_event $SESSION_NAME "sched_process_free" + lttng_enable_kernel_event $SESSION_NAME "sched_process_fork" start_lttng_tracing_ok + + # Running a process and waiting for its completion forces the triggering of + # fork, sched_switch and exit events + eval ${TESTCMD} stop_lttng_tracing_ok validate_trace "sched_switch" $TRACE_PATH validate_trace "sched_process_exit" $TRACE_PATH - validate_trace "sched_process_free" $TRACE_PATH + validate_trace "sched_process_fork" $TRACE_PATH destroy_lttng_session_ok $SESSION_NAME @@ -57,6 +63,10 @@ function test_enable_after_start() start_lttng_tracing_ok lttng_enable_kernel_event $SESSION_NAME "sched_process_exit" + + # Running a process and waiting for its completion forces the triggering of + # sched_switch and exit events + eval ${TESTCMD} stop_lttng_tracing_ok validate_trace "sched_switch" $TRACE_PATH -- 2.34.1