projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: tests: don't use pidof to wait for test apps
[lttng-tools.git]
/
tests
/
regression
/
tools
/
snapshots
/
ust_test
diff --git
a/tests/regression/tools/snapshots/ust_test
b/tests/regression/tools/snapshots/ust_test
index e727aa6349f5075fcf04531374af08b9092c9571..a35fbf37fb9022c22946bd9c96dcd7f4a3427548 100755
(executable)
--- a/
tests/regression/tools/snapshots/ust_test
+++ b/
tests/regression/tools/snapshots/ust_test
@@
-63,11
+63,13
@@
function start_test_app()
rm -f $tmp_file
}
rm -f $tmp_file
}
-function
kill
_test_app()
+function
stop
_test_app()
{
diag "Killing $TESTAPP_NAME"
PID_APP=`pidof $TESTAPP_NAME`
kill $PID_APP >/dev/null 2>&1
{
diag "Killing $TESTAPP_NAME"
PID_APP=`pidof $TESTAPP_NAME`
kill $PID_APP >/dev/null 2>&1
+ diag "Waiting on $TESTAPP_NAME"
+ wait
}
function snapshot_add_output ()
}
function snapshot_add_output ()
@@
-172,7
+174,7
@@
function test_ust_local_snapshot ()
break
fi
break
fi
-
kill
_test_app
+
stop
_test_app
}
function test_ust_local_snapshot_max_size ()
}
function test_ust_local_snapshot_max_size ()
@@
-220,7
+222,7
@@
function test_ust_local_snapshot_max_size ()
rm -rf $TRACE_PATH
fi
rm -rf $TRACE_PATH
fi
-
kill
_test_app
+
stop
_test_app
}
function test_ust_local_snapshot_large_metadata ()
}
function test_ust_local_snapshot_large_metadata ()
@@
-286,7
+288,7
@@
function test_ust_per_uid_local_snapshot ()
break
fi
break
fi
-
kill
_test_app
+
stop
_test_app
}
function test_ust_per_uid_local_snapshot_post_mortem ()
}
function test_ust_per_uid_local_snapshot_post_mortem ()
@@
-300,7
+302,7
@@
function test_ust_per_uid_local_snapshot_post_mortem ()
# Returns once the application has at least fired ONE tracepoint.
start_test_app
# Returns once the application has at least fired ONE tracepoint.
start_test_app
-
kill
_test_app
+
stop
_test_app
lttng_snapshot_record $SESSION_NAME
stop_lttng_tracing $SESSION_NAME
lttng_snapshot_record $SESSION_NAME
stop_lttng_tracing $SESSION_NAME
@@
-344,7
+346,7
@@
function test_ust_local_snapshots ()
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
-
kill
_test_app
+
stop
_test_app
}
plan_tests $NUM_TESTS
}
plan_tests $NUM_TESTS
This page took
0.026743 seconds
and
4
git commands to generate.