File 0623-erts-Fix-testcases-to-run-with-S1.patch of Package erlang

From 97cb123acd15e36a92435aab41c14ffb82440793 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Tue, 5 Nov 2019 16:00:47 +0100
Subject: [PATCH 1/3] erts: Fix testcases to run with +S1

---
 erts/emulator/test/receive_SUITE.erl | 16 +++++++++++++++-
 erts/emulator/test/z_SUITE.erl       | 16 +++++++++++++++-
 lib/stdlib/test/escript_SUITE.erl    |  3 ++-
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/erts/emulator/test/receive_SUITE.erl b/erts/emulator/test/receive_SUITE.erl
index 4f24ecccb7..519963610c 100644
--- a/erts/emulator/test/receive_SUITE.erl
+++ b/erts/emulator/test/receive_SUITE.erl
@@ -24,7 +24,7 @@
 
 -include_lib("common_test/include/ct.hrl").
 
--export([all/0, suite/0,
+-export([all/0, suite/0, init_per_testcase/2, end_per_testcase/2,
 	 call_with_huge_message_queue/1,receive_in_between/1,
          receive_opt_exception/1,receive_opt_recursion/1]).
 
@@ -36,6 +36,20 @@ all() ->
     [call_with_huge_message_queue, receive_in_between,
      receive_opt_exception, receive_opt_recursion].
 
+init_per_testcase(receive_opt_deferred_save, Config) ->
+    case erlang:system_info(schedulers) of
+        1 ->
+            {skip, "Needs more schedulers to run"};
+        _ ->
+            Config
+    end;
+init_per_testcase(_, Config) ->
+    Config.
+
+
+end_per_testcase(_Name, Config) ->
+    Config.
+
 call_with_huge_message_queue(Config) when is_list(Config) ->
     Pid = spawn_link(fun echo_loop/0),
     _WarmUpTime = time_calls(Pid),
diff --git a/erts/emulator/test/z_SUITE.erl b/erts/emulator/test/z_SUITE.erl
index e9755752f2..29afda98a3 100644
--- a/erts/emulator/test/z_SUITE.erl
+++ b/erts/emulator/test/z_SUITE.erl
@@ -32,7 +32,7 @@
 
 -include_lib("common_test/include/ct.hrl").
 
--export([all/0, suite/0]).
+-export([all/0, suite/0, init_per_testcase/2, end_per_testcase/2]).
 
 -export([used_thread_specific_events/1, schedulers_alive/1,
          node_container_refc_check/1,
@@ -56,6 +56,20 @@ all() ->
      leaked_processes,
      literal_area_collector].
 
+init_per_testcase(schedulers_alive, Config) ->
+    case erlang:system_info(schedulers) of
+        1 ->
+            {skip, "Needs more schedulers to run"};
+        _ ->
+            Config
+    end;
+init_per_testcase(_, Config) ->
+    Config.
+
+
+end_per_testcase(_Name, Config) ->
+    Config.
+
 %%%
 %%% The test cases -------------------------------------------------------------
 %%%
diff --git a/lib/stdlib/test/escript_SUITE.erl b/lib/stdlib/test/escript_SUITE.erl
index 8ffd01f2b2..031aeaa527 100644
--- a/lib/stdlib/test/escript_SUITE.erl
+++ b/lib/stdlib/test/escript_SUITE.erl
@@ -980,7 +980,8 @@ do_run(Dir, Cmd, Expected0) ->
     io:format("Run: ~p\n", [Cmd]),
     Expected = iolist_to_binary(expected_output(Expected0, Dir)),
 
-    Env = [{"PATH",Dir++":"++os:getenv("PATH")}],
+    Env = [{"PATH",Dir++":"++os:getenv("PATH")},
+           {"ERL_FLAGS",false},{"ERL_AFLAGS",false}],
     Port = open_port({spawn,Cmd}, [exit_status,eof,in,{env,Env}]),
     Res = get_data(Port, []),
     receive
-- 
2.16.4