diff mbox series

[lttng-tools] Fix: test code assumes that child process is schedule to run before parent

Message ID 20210409144130.701522-1-wallinux@gmail.com
State New
Headers show
Series [lttng-tools] Fix: test code assumes that child process is schedule to run before parent | expand

Commit Message

Anders Wallin April 9, 2021, 2:41 p.m. UTC
the following tests fails on arm64
- test_event_vpid_tracker ust 0 "${EVENT_NAME}"
- test_event_vpid_track_untrack ust 0 "${EVENT_NAME}"
- test_event_pid_tracker ust 0 "${EVENT_NAME}"
- test_event_pid_track_untrack ust 0 "${EVENT_NAME}"

Signed-off-by: Anders Wallin <wallinux at gmail.com>
---
 .../tools/tracker/test_event_tracker           | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

Comments

Mathieu Desnoyers April 9, 2021, 7:12 p.m. UTC | #1
----- On Apr 9, 2021, at 10:41 AM, lttng-dev lttng-dev at lists.lttng.org wrote:

> the following tests fails on arm64
> - test_event_vpid_tracker ust 0 "${EVENT_NAME}"
> - test_event_vpid_track_untrack ust 0 "${EVENT_NAME}"
> - test_event_pid_tracker ust 0 "${EVENT_NAME}"
> - test_event_pid_track_untrack ust 0 "${EVENT_NAME}"

The approach looks good to me, thanks!

Acked-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>

> 
> Signed-off-by: Anders Wallin <wallinux at gmail.com>
> ---
> .../tools/tracker/test_event_tracker           | 18 +++++++++++++-----
> 1 file changed, 13 insertions(+), 5 deletions(-)
> 
> diff --git a/tests/regression/tools/tracker/test_event_tracker
> b/tests/regression/tools/tracker/test_event_tracker
> index 711690af..7f7d68da 100755
> --- a/tests/regression/tools/tracker/test_event_tracker
> +++ b/tests/regression/tools/tracker/test_event_tracker
> @@ -5,7 +5,7 @@
> #
> # SPDX-License-Identifier: GPL-2.0-only
> 
> -TEST_DESC="LTTng - Event traker test"
> +TEST_DESC="LTTng - Event tracker test"
> 
> CURDIR=$(dirname "$0")/
> TESTDIR="$CURDIR/../../.."
> @@ -17,8 +17,8 @@
> TESTAPP_KERNEL_BIN="$TESTAPP_PATH/$TESTAPP_KERNEL_NAME/$TESTAPP_KERNEL_NAME"
> SESSION_NAME="tracker"
> NR_ITER=100
> NUM_GLOBAL_TESTS=2
> -NUM_UST_TESTS=283
> -NUM_KERNEL_TESTS=462
> +NUM_UST_TESTS=289
> +NUM_KERNEL_TESTS=468
> NUM_TESTS=$((NUM_UST_TESTS+NUM_KERNEL_TESTS+NUM_GLOBAL_TESTS))
> 
> NR_USEC_WAIT=0	#for UST gen events
> @@ -130,6 +130,8 @@ function test_event_vpid_tracker()
> 
> 	prepare_"$domain"_app
> 
> +	lttng_untrack_"$domain"_ok "--all --vpid"
> +
> 	start_lttng_tracing_ok
> 
> 	if [ "$expect_event" -eq 1 ]; then
> @@ -146,7 +148,7 @@ function test_event_vpid_tracker()
> 	if [ "$expect_event" -eq 1 ]; then
> 		validate_trace "$EVENT_NAME" "$trace_path"
> 	else
> -		validate_trace_empty "$trace_path"
> +		validate_trace_session_"$domain"_empty "$trace_path"
> 	fi
> 
> 	rm -rf "$trace_path"
> @@ -173,6 +175,8 @@ function test_event_pid_tracker()
> 
> 	prepare_"$domain"_app
> 
> +	lttng_untrack_"$domain"_ok "--all --pid"
> +
> 	start_lttng_tracing_ok
> 
> 	if [ "$expect_event" -eq 1 ]; then
> @@ -189,7 +193,7 @@ function test_event_pid_tracker()
> 	if [ "$expect_event" -eq 1 ]; then
> 		validate_trace "$EVENT_NAME" "$trace_path"
> 	else
> -		validate_trace_empty "$trace_path"
> +	    	validate_trace_session_"$domain"_empty "$trace_path"
> 	fi
> 
> 	rm -rf "$trace_path"
> @@ -275,6 +279,8 @@ function test_event_vpid_track_untrack()
> 
> 	prepare_"$domain"_app
> 
> +	lttng_untrack_"$domain"_ok "--all --vpid"
> +
> 	start_lttng_tracing_ok
> 
> 	lttng_track_"$domain"_ok "--vpid ${CHILD_PID}"
> @@ -315,6 +321,8 @@ function test_event_pid_track_untrack()
> 
> 	prepare_"$domain"_app
> 
> +	lttng_untrack_"$domain"_ok "--all --pid"
> +
> 	start_lttng_tracing_ok
> 
> 	lttng_track_"$domain"_ok "--pid ${CHILD_PID}"
> --
> 2.31.1
> 
> _______________________________________________
> lttng-dev mailing list
> lttng-dev at lists.lttng.org
> https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
diff mbox series

Patch

diff --git a/tests/regression/tools/tracker/test_event_tracker b/tests/regression/tools/tracker/test_event_tracker
index 711690af..7f7d68da 100755
--- a/tests/regression/tools/tracker/test_event_tracker
+++ b/tests/regression/tools/tracker/test_event_tracker
@@ -5,7 +5,7 @@ 
 #
 # SPDX-License-Identifier: GPL-2.0-only
 
-TEST_DESC="LTTng - Event traker test"
+TEST_DESC="LTTng - Event tracker test"
 
 CURDIR=$(dirname "$0")/
 TESTDIR="$CURDIR/../../.."
@@ -17,8 +17,8 @@  TESTAPP_KERNEL_BIN="$TESTAPP_PATH/$TESTAPP_KERNEL_NAME/$TESTAPP_KERNEL_NAME"
 SESSION_NAME="tracker"
 NR_ITER=100
 NUM_GLOBAL_TESTS=2
-NUM_UST_TESTS=283
-NUM_KERNEL_TESTS=462
+NUM_UST_TESTS=289
+NUM_KERNEL_TESTS=468
 NUM_TESTS=$((NUM_UST_TESTS+NUM_KERNEL_TESTS+NUM_GLOBAL_TESTS))
 
 NR_USEC_WAIT=0	#for UST gen events
@@ -130,6 +130,8 @@  function test_event_vpid_tracker()
 
 	prepare_"$domain"_app
 
+	lttng_untrack_"$domain"_ok "--all --vpid"
+
 	start_lttng_tracing_ok
 
 	if [ "$expect_event" -eq 1 ]; then
@@ -146,7 +148,7 @@  function test_event_vpid_tracker()
 	if [ "$expect_event" -eq 1 ]; then
 		validate_trace "$EVENT_NAME" "$trace_path"
 	else
-		validate_trace_empty "$trace_path"
+		validate_trace_session_"$domain"_empty "$trace_path"
 	fi
 
 	rm -rf "$trace_path"
@@ -173,6 +175,8 @@  function test_event_pid_tracker()
 
 	prepare_"$domain"_app
 
+	lttng_untrack_"$domain"_ok "--all --pid"
+
 	start_lttng_tracing_ok
 
 	if [ "$expect_event" -eq 1 ]; then
@@ -189,7 +193,7 @@  function test_event_pid_tracker()
 	if [ "$expect_event" -eq 1 ]; then
 		validate_trace "$EVENT_NAME" "$trace_path"
 	else
-		validate_trace_empty "$trace_path"
+	    	validate_trace_session_"$domain"_empty "$trace_path"
 	fi
 
 	rm -rf "$trace_path"
@@ -275,6 +279,8 @@  function test_event_vpid_track_untrack()
 
 	prepare_"$domain"_app
 
+	lttng_untrack_"$domain"_ok "--all --vpid"
+
 	start_lttng_tracing_ok
 
 	lttng_track_"$domain"_ok "--vpid ${CHILD_PID}"
@@ -315,6 +321,8 @@  function test_event_pid_track_untrack()
 
 	prepare_"$domain"_app
 
+	lttng_untrack_"$domain"_ok "--all --pid"
+
 	start_lttng_tracing_ok
 
 	lttng_track_"$domain"_ok "--pid ${CHILD_PID}"