<div dir="ltr">Merged in master, stable-2.7 and stable-2.6, thanks!<div><br></div><div>Jérémie</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Aug 6, 2015 at 3:52 PM, Mathieu Desnoyers <span dir="ltr"><<a href="mailto:mathieu.desnoyers@efficios.com" target="_blank">mathieu.desnoyers@efficios.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Signed-off-by: Mathieu Desnoyers <<a href="mailto:mathieu.desnoyers@efficios.com">mathieu.desnoyers@efficios.com</a>><br>
---<br>
tests/regression/tools/mi/test_mi | 20 +++++++++++++++++---<br>
1 file changed, 17 insertions(+), 3 deletions(-)<br>
<br>
diff --git a/tests/regression/tools/mi/test_mi b/tests/regression/tools/mi/test_mi<br>
index a5c7493..5bd29ed 100755<br>
--- a/tests/regression/tools/mi/test_mi<br>
+++ b/tests/regression/tools/mi/test_mi<br>
@@ -27,8 +27,8 @@ RELAYD_BIN="lttng-relayd"<br>
TESTAPP_PATH="$TESTDIR/utils/testapp"<br>
TESTAPP_NAME="gen-ust-events"<br>
TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"<br>
-NR_USEC_WAIT=10000<br>
-<br>
+NR_USEC_WAIT=0<br>
+NR_ITER=10000<br>
<br>
#Temp file output<br>
OUTPUT_DIR=$(mktemp -d)<br>
@@ -500,14 +500,25 @@ function test_list_session ()<br>
<br>
function test_list_ust_event ()<br>
{<br>
+ local file_sync_after_first=$(mktemp -u)<br>
+ local file_sync_before_last=$(mktemp -u)<br>
+<br>
OUTPUT_FILE="list_ust_event.xml"<br>
<br>
#Test buid up<br>
OUTPUT_DEST=$OUTPUT_DIR/$OUTPUT_FILE<br>
<br>
#Begin testing<br>
- $TESTAPP_BIN $NR_USEC_WAIT & 2>/dev/null<br>
+ $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} ${file_sync_before_last} & 2>/dev/null<br>
+<br>
+ while [ ! -f "${file_sync_after_first}" ]; do<br>
+ sleep 0.5<br>
+ done<br>
+<br>
list_lttng_with_opts "-u -f"<br>
+<br>
+ touch ${file_sync_before_last}<br>
+<br>
$XML_VALIDATE $OUTPUT_DEST<br>
ok $? "Mi test: list ust event xsd validation"<br>
<br>
@@ -530,6 +541,9 @@ function test_list_ust_event ()<br>
<br>
#Wait for all background processes<br>
wait<br>
+<br>
+ rm -f ${file_sync_after_first}<br>
+ rm -f ${file_sync_before_last}<br>
}<br>
<br>
function test_start_stop () {<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.1.4<br>
<br>
</font></span></blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature">Jérémie Galarneau<br>EfficiOS Inc.<br><a href="http://www.efficios.com" target="_blank">http://www.efficios.com</a></div>
</div>