Merge branch 'siri/sasl/upgrade-erts/OTP-9438'

* siri/sasl/upgrade-erts/OTP-9438:
  Fix bug in erts upgrade on windows
  Add release vsn info to erts_vsn_changed warning
  Check for sasl application in systools:make_script and make_relup
  Add syntax check of relup to check_install_release and install_release
  Add documentation for upgrade from pre R15 to post R15 sasl
  Handle upgrade from pre R15 to post R15 sasl
  Step version of sasl to 2.2 for R15
  Document upgrade instructions restart_new_emulator and restart_emulator
  Wait for two restarts in upgrade_restart test
  Add restart_new_emulator instruction to kernel, stdlib and sasl appups
  Distinguish restart_new_emulator from restart_emulator in upgrade instructions
  Upgrade erts: merge sys.config for tmp release instead of using old
  Allow regexp for version in .appup
  Restart emulator before running upgrade script when erts is upgraded

Conflicts:
	lib/sasl/src/release_handler.erl
	lib/sasl/test/release_handler_SUITE.erl

10 files changed, 101 insertions, 0 deletions

diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-2.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-2.1/ebin/fe.app
new file mode 100644
index 0000000000..3cb0b0c2cf
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-2.1/ebin/fe.app
@@ -0,0 +1,7 @@
+{application, fe,
+ [{description, "ERICSSON NR FOR FE"},
+  {vsn, "2.1"},
+  {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+  {registered, []},
+  {applications, []},
+  {mod, {fe1, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-500.18.7/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-500.18.7/ebin/fe.app
new file mode 100644
index 0000000000..3a5c0ddd9b
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-500.18.7/ebin/fe.app
@@ -0,0 +1,7 @@
+{application, fe,
+ [{description, "ERICSSON NR FOR FE"},
+  {vsn, "500.18.7"},
+  {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+  {registered, []},
+  {applications, []},
+  {mod, {fe1, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-2.1.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-2.1.1/ebin/fe.app
new file mode 100644
index 0000000000..c7ba1dfe91
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-2.1.1/ebin/fe.app
@@ -0,0 +1,8 @@
+{application, fe,
+   [{description, "ERICSSON NR FOR FE"},
+    {vsn, "2.1.1"},
+    {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+    {registered, []},
+    {applications, []},
+    {env, []},
+    {start, {fe2, start, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-2.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-2.1/ebin/fe.app
new file mode 100644
index 0000000000..47ea248720
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-2.1/ebin/fe.app
@@ -0,0 +1,8 @@
+{application, fe,
+   [{description, "ERICSSON NR FOR FE"},
+    {vsn, "2.1"},
+    {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+    {registered, []},
+    {applications, []},
+    {env, []},
+    {start, {fe2, start, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-3.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-3.1/ebin/fe.app
new file mode 100644
index 0000000000..0696e2494c
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-3.1/ebin/fe.app
@@ -0,0 +1,7 @@
+{application, fe,
+ [{description, "ERICSSON NR FOR FE"},
+  {vsn, "3.1"},
+  {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+  {registered, []},
+  {applications, []},
+  {mod, {fe1, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-3.1/ebin/fe.appup b/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-3.1/ebin/fe.appup
new file mode 100644
index 0000000000..6b99c47e53
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-3.1/ebin/fe.appup
@@ -0,0 +1,28 @@
+%% -*- erlang -*-
+%% Release upgrade script for fe (front end)
+%%
+
+{
+  "3.1",
+  %% Upgrade from:
+  [
+   {<<"2\\.[0-9]+">>, % matches 2.X in full length and 2.X.Y... only partly
+    [{update, fe1, soft, soft_purge, soft_purge, []},
+     {update, fe2, soft, soft_purge, soft_purge, [fe1]},
+     {update, fe3, {advanced, extra}, soft_purge, soft_purge, [fe1, fe2]}
+    ]},
+   {<<"2(\\.[0-9]+)+">>, % matches 2.X.Y... in full length
+    [{update, fe1, soft, soft_purge, soft_purge, []},
+     {update, fe2, soft, soft_purge, soft_purge, [fe1]},
+     {update, fe3, {advanced, extra}, soft_purge, soft_purge,[fe1, fe2]},
+     restart_emulator]}
+  ],
+
+  %% Downgrade to:
+  [
+   {<<"2\\.[0-9]+">>, % matches 2.X in full length and 2.X.Y... only partly
+    [{update, fe2, soft, soft_purge, soft_purge, []},
+     {update, fe3, {advanced, extra}, soft_purge, soft_purge, [fe2]}
+    ]}
+  ]
+}.
diff --git a/lib/sasl/test/systools_SUITE_data/lib/sasl-9.9/ebin/sasl.app b/lib/sasl/test/systools_SUITE_data/lib/sasl-9.9/ebin/sasl.app
new file mode 100644
index 0000000000..3bcc1a4619
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/lib/sasl-9.9/ebin/sasl.app
@@ -0,0 +1,6 @@
+{application, sasl,
+ [{description, "FAKE FUTURE SASL"},
+  {vsn, "9.9"},
+  {modules, []},
+  {registered, []},
+  {applications, []}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/lib/sasl-9.9/ebin/sasl.appup b/lib/sasl/test/systools_SUITE_data/lib/sasl-9.9/ebin/sasl.appup
new file mode 100644
index 0000000000..cff0c69b6e
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/lib/sasl-9.9/ebin/sasl.appup
@@ -0,0 +1,12 @@
+%%
+%% Fake release upgrade script for sasl
+%%
+
+{
+ "9.9",
+ [{<<".+">>,[restart_new_emulator]}
+ ],
+
+ [{<<".+">>,[restart_new_emulator]}
+ ]
+}.
diff --git a/lib/sasl/test/systools_SUITE_data/lib/sasl/ebin/sasl.app b/lib/sasl/test/systools_SUITE_data/lib/sasl/ebin/sasl.app
new file mode 100644
index 0000000000..aaeb37fa4d
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/lib/sasl/ebin/sasl.app
@@ -0,0 +1,6 @@
+{application, sasl,
+ [{description, "FAKE SASL"},
+  {vsn, "1.0"},
+  {modules, []},
+  {registered, []},
+  {applications, []}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/lib/sasl/ebin/sasl.appup b/lib/sasl/test/systools_SUITE_data/lib/sasl/ebin/sasl.appup
new file mode 100644
index 0000000000..796a1e7368
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/lib/sasl/ebin/sasl.appup
@@ -0,0 +1,12 @@
+%%
+%% Fake release upgrade script for sasl
+%%
+
+{
+ "1.0",
+ [
+ ],
+
+ [
+ ]
+}.