File 5631-megaco-test-Did-not-catch-the-skip-throw.patch of Package erlang

From b2a7215154cd78688ed379ebb4879e0c3e809bde Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Mon, 4 May 2020 06:51:54 +0200
Subject: [PATCH 1/3] [megaco|test] Did not catch the skip throw

---
 lib/megaco/test/megaco_test_lib.erl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/megaco/test/megaco_test_lib.erl b/lib/megaco/test/megaco_test_lib.erl
index ad6ae2309e..f33d26d8b6 100644
--- a/lib/megaco/test/megaco_test_lib.erl
+++ b/lib/megaco/test/megaco_test_lib.erl
@@ -553,7 +553,7 @@ init_per_suite(Config) ->
 		    {darwin, DarwinVersionVerify}]},
             {win32, SkipWindowsOnVirtual}
            ],
-    case os_based_skip(COND) of
+    try os_based_skip(COND) of
         true ->
             {skip, "Unstable host and/or os (or combo thererof)"};
         false ->
@@ -566,6 +566,9 @@ init_per_suite(Config) ->
                 throw:{skip, _} = SKIP ->
                     SKIP
             end
+    catch
+        throw:{skip, _} = SKIP ->
+            SKIP
     end.
 
 %% We start the global system monitor unless explicitly disabled
-- 
2.26.1