File 3012-kernel-Fix-quoting-in-init_SUITE-restart-tc.patch of Package erlang
From eed57371ac0186c6f7bbe9ff0ed68048085ce206 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Thu, 16 Apr 2020 09:48:53 +0200
Subject: [PATCH 1/3] kernel: Fix quoting in init_SUITE restart tc
---
lib/kernel/test/init_SUITE.erl | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/lib/kernel/test/init_SUITE.erl b/lib/kernel/test/init_SUITE.erl
index ceee387289..0a18ac35d5 100644
--- a/lib/kernel/test/init_SUITE.erl
+++ b/lib/kernel/test/init_SUITE.erl
@@ -354,11 +354,18 @@ restart_with_mode(Config) when is_list(Config) ->
{ok,[[Erl]]} = init:get_argument(progname),
ModPath = filename:dirname(code:which(?MODULE)),
- Eval1 = "'Mode=code:get_mode(), io:fwrite(Mode), case Mode of interactive -> init:restart([{mode,embedded}]); embedded -> erlang:halt() end'",
+ Quote = case os:type() of
+ {win,_} ->
+ [$"];
+ {unix,_} ->
+ [$']
+ end,
+
+ Eval1 = Quote ++ "Mode=code:get_mode(), io:fwrite(Mode), case Mode of interactive -> init:restart([{mode,embedded}]); embedded -> erlang:halt() end" ++ Quote,
Cmd1 = Erl ++ " -mode interactive -noshell -eval " ++ Eval1,
"interactiveembedded" = os:cmd(Cmd1),
- Eval2 = "'Mode=code:get_mode(), io:fwrite(Mode), case Mode of embedded -> init:restart([{mode,interactive}]); interactive -> erlang:halt() end'",
+ Eval2 = Quote ++ "Mode=code:get_mode(), io:fwrite(Mode), case Mode of embedded -> init:restart([{mode,interactive}]); interactive -> erlang:halt() end" ++ Quote,
Cmd2 = Erl ++ " -mode embedded -noshell -eval " ++ Eval2,
"embeddedinteractive" = os:cmd(Cmd2),
--
2.16.4