File 0373-megaco-test-Tweaked-mstone1-example-and-te... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0373-megaco-test-Tweaked-mstone1-example-and-test-case-ti.patch of Package erlang (Revision 57cf7c87cb80e2aaaf3f20327bf57529)

Currently displaying revision 57cf7c87cb80e2aaaf3f20327bf57529 , Show latest

From 35bed944285a045089f81e4d67f6e0a0f0e81fe4 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Mon, 10 Jan 2022 12:00:48 +0100
Subject: [PATCH 03/13] [megaco|test] Tweaked mstone1 example and test case
 timetrap

OTP-17839
---
 .../examples/meas/megaco_codec_mstone1.erl    | 33 ++++++++++++-------
 lib/megaco/test/megaco_examples_SUITE.erl     |  7 +++-
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/lib/megaco/examples/meas/megaco_codec_mstone1.erl b/lib/megaco/examples/meas/megaco_codec_mstone1.erl
index e2df04b683..2cd1106d4f 100644
--- a/lib/megaco/examples/meas/megaco_codec_mstone1.erl
+++ b/lib/megaco/examples/meas/megaco_codec_mstone1.erl
@@ -212,13 +212,15 @@ mstone_init(MessagePackage, RunTime, Factor, Codecs, DrvInclude) ->
     Pid = spawn(
 	    fun() -> 
 		    process_flag(trap_exit, true),
-		    do_mstone(MessagePackage,
-                              RunTime, Factor, Codecs, DrvInclude),  
-		    Parent ! {done, self()}
+		    Done = do_mstone(MessagePackage,
+                                     RunTime, Factor, Codecs, DrvInclude),  
+		    Parent ! {Done, self()}
 	    end),
     receive
 	{done, Pid} ->
-	    ok
+	    ok;
+        {{error, _} = ERROR, Pid} ->
+            ERROR
     end.
 			 
 do_mstone(MessagePackage, RunTime, Factor, Codecs, DrvInclude) ->
@@ -227,14 +229,21 @@ do_mstone(MessagePackage, RunTime, Factor, Codecs, DrvInclude) ->
     ?LIB:display_system_info(),
     ?LIB:display_app_info(),
     io:format("~n", []),
-    {Pid, Conf} = ?LIB:start_flex_scanner(),
-    put(flex_scanner_conf, Conf),
-    EMessages = ?LIB:expanded_messages(MessagePackage, Codecs, DrvInclude), 
-    EMsgs  = duplicate(Factor, EMessages),
-    MStone = t1(RunTime, EMsgs),
-    ?LIB:stop_flex_scanner(Pid),
-    io:format("~n", []),
-    io:format("MStone: ~p~n", [MStone]).
+    case ?LIB:start_flex_scanner() of
+        {Pid, Conf} when is_pid(Pid) ->
+            put(flex_scanner_conf, Conf),
+            EMessages = ?LIB:expanded_messages(MessagePackage, Codecs, DrvInclude), 
+            EMsgs  = duplicate(Factor, EMessages),
+            MStone = t1(RunTime, EMsgs),
+            ?LIB:stop_flex_scanner(Pid),
+            io:format("~n", []),
+            io:format("MStone: ~p~n", [MStone]),
+            done;
+        {error, Reason} = ERROR ->
+            io:format("<ERROR> Failed starting flex scanner: "
+                      "~n      ~p", [Reason]),
+            ERROR
+    end.
 
 duplicate(N, Elements) ->
     duplicate(N, Elements, []).
diff --git a/lib/megaco/test/megaco_examples_SUITE.erl b/lib/megaco/test/megaco_examples_SUITE.erl
index bf56202eda..df0a76e0ec 100644
--- a/lib/megaco/test/megaco_examples_SUITE.erl
+++ b/lib/megaco/test/megaco_examples_SUITE.erl
@@ -583,7 +583,7 @@ meas(suite) ->
     [];
 meas(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
-    ct:timetrap(?MINS(2)),
+    ct:timetrap(?MINS(5)),
     WorkerNode = ?config(worker_node, Config),
     do_meas(?FUNCTION_NAME, WorkerNode, megaco_codec_meas, start, [100]).
 
@@ -596,6 +596,11 @@ do_meas(SName, Node, Mod, Func, Args) ->
     {Pid, MRef} = spawn_monitor(F),
     p("await completion"),
     receive
+        {'DOWN', MRef, process, Pid,
+         {error, {failed_loading_flex_scanner_driver, Reason}}} ->
+            p("<ERROR> worker process failed loading flex scanner: "
+              "~n      ~p", [Reason]),
+            ?SKIP(Reason);
         {'DOWN', MRef, process, Pid, {error, Reason}} ->
             p("<ERROR> worker process terminated: "
               "~n      ~p", [Reason]),
-- 
2.31.1

Places

File 0373-megaco-test-Tweaked-mstone1-example-and-test-case-ti.patch of Package erlang (Revision 57cf7c87cb80e2aaaf3f20327bf57529)

Places