From 7a1fe16bca11023910e06267ebd2f5bc417fd73a Mon Sep 17 00:00:00 2001
From: Maxim Lipnin <v-maxlip@microsoft.com>
Date: Thu, 25 Feb 2021 11:13:56 +0300
Subject: [PATCH 1/3] Adjust WebAssembly functional tests structure

---
 src/libraries/tests.proj                                        | 2 +-
 .../{wasm/AOT/browser => WebAssembly/Browser/AOT}/Program.cs    | 0
 .../Browser/AOT/WebAssembly.Browser.AOT.Test.csproj}            | 0
 .../{wasm/AOT/browser => WebAssembly/Browser/AOT}/index.html    | 0
 .../{wasm/AOT/browser => WebAssembly/Browser/AOT}/runtime.js    | 0
 .../browser => WebAssembly/Browser/NormalInterp}/Program.cs     | 0
 .../NormalInterp/WebAssembly.Browser.NormalInterp.Test.csproj}  | 0
 .../browser => WebAssembly/Browser/NormalInterp}/index.html     | 0
 .../browser => WebAssembly/Browser/NormalInterp}/runtime.js     | 0
 .../{wasm/AOT/console => WebAssembly/Console/AOT}/Program.cs    | 0
 .../Console/AOT/WebAssembly.Console.AOT.Test.csproj}            | 0
 .../console => WebAssembly/Console/NormalInterp}/Program.cs     | 0
 .../NormalInterp/WebAssembly.Console.NormalInterp.Test.csproj}  | 0
 .../FunctionalTests/{wasm => WebAssembly}/Directory.Build.props | 0
 .../{wasm => WebAssembly}/Directory.Build.targets               | 0
 .../toplevel => WebAssembly/TopLevel/NormalInterp}/Program.cs   | 0
 .../NormalInterp/WebAssembly.TopLevel.NormalInterp.Test.csproj} | 0
 17 files changed, 1 insertion(+), 1 deletion(-)
 rename src/tests/FunctionalTests/{wasm/AOT/browser => WebAssembly/Browser/AOT}/Program.cs (100%)
 rename src/tests/FunctionalTests/{wasm/AOT/browser/Wasm.Aot.Browser.Test.csproj => WebAssembly/Browser/AOT/WebAssembly.Browser.AOT.Test.csproj} (100%)
 rename src/tests/FunctionalTests/{wasm/AOT/browser => WebAssembly/Browser/AOT}/index.html (100%)
 rename src/tests/FunctionalTests/{wasm/AOT/browser => WebAssembly/Browser/AOT}/runtime.js (100%)
 rename src/tests/FunctionalTests/{wasm/Interpreter/browser => WebAssembly/Browser/NormalInterp}/Program.cs (100%)
 rename src/tests/FunctionalTests/{wasm/Interpreter/browser/Wasm.Interpreter.Browser.Test.csproj => WebAssembly/Browser/NormalInterp/WebAssembly.Browser.NormalInterp.Test.csproj} (100%)
 rename src/tests/FunctionalTests/{wasm/Interpreter/browser => WebAssembly/Browser/NormalInterp}/index.html (100%)
 rename src/tests/FunctionalTests/{wasm/Interpreter/browser => WebAssembly/Browser/NormalInterp}/runtime.js (100%)
 rename src/tests/FunctionalTests/{wasm/AOT/console => WebAssembly/Console/AOT}/Program.cs (100%)
 rename src/tests/FunctionalTests/{wasm/AOT/console/Wasm.Aot.Console.Test.csproj => WebAssembly/Console/AOT/WebAssembly.Console.AOT.Test.csproj} (100%)
 rename src/tests/FunctionalTests/{wasm/Interpreter/console => WebAssembly/Console/NormalInterp}/Program.cs (100%)
 rename src/tests/FunctionalTests/{wasm/Interpreter/console/Wasm.Interpreter.Console.Test.csproj => WebAssembly/Console/NormalInterp/WebAssembly.Console.NormalInterp.Test.csproj} (100%)
 rename src/tests/FunctionalTests/{wasm => WebAssembly}/Directory.Build.props (100%)
 rename src/tests/FunctionalTests/{wasm => WebAssembly}/Directory.Build.targets (100%)
 rename src/tests/FunctionalTests/{wasm/Interpreter/toplevel => WebAssembly/TopLevel/NormalInterp}/Program.cs (100%)
 rename src/tests/FunctionalTests/{wasm/Interpreter/toplevel/Wasm.Interpreter.TopLevel.Test.csproj => WebAssembly/TopLevel/NormalInterp/WebAssembly.TopLevel.NormalInterp.Test.csproj} (100%)

diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index 6a0eb404148391..b920de0d7c057c 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -290,7 +290,7 @@
   <ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(TargetOS)' == 'Browser'">
     <ProjectReference Include="$(MonoProjectRoot)sample\wasm\**\*.Sample.csproj"
                       BuildInParallel="false" />
-    <ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\wasm\**\*.Test.csproj"
+    <ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\WebAssembly\**\*.Test.csproj"
                       BuildInParallel="false" />
   </ItemGroup>
 
diff --git a/src/tests/FunctionalTests/wasm/AOT/browser/Program.cs b/src/tests/FunctionalTests/WebAssembly/Browser/AOT/Program.cs
similarity index 100%
rename from src/tests/FunctionalTests/wasm/AOT/browser/Program.cs
rename to src/tests/FunctionalTests/WebAssembly/Browser/AOT/Program.cs
diff --git a/src/tests/FunctionalTests/wasm/AOT/browser/Wasm.Aot.Browser.Test.csproj b/src/tests/FunctionalTests/WebAssembly/Browser/AOT/WebAssembly.Browser.AOT.Test.csproj
similarity index 100%
rename from src/tests/FunctionalTests/wasm/AOT/browser/Wasm.Aot.Browser.Test.csproj
rename to src/tests/FunctionalTests/WebAssembly/Browser/AOT/WebAssembly.Browser.AOT.Test.csproj
diff --git a/src/tests/FunctionalTests/wasm/AOT/browser/index.html b/src/tests/FunctionalTests/WebAssembly/Browser/AOT/index.html
similarity index 100%
rename from src/tests/FunctionalTests/wasm/AOT/browser/index.html
rename to src/tests/FunctionalTests/WebAssembly/Browser/AOT/index.html
diff --git a/src/tests/FunctionalTests/wasm/AOT/browser/runtime.js b/src/tests/FunctionalTests/WebAssembly/Browser/AOT/runtime.js
similarity index 100%
rename from src/tests/FunctionalTests/wasm/AOT/browser/runtime.js
rename to src/tests/FunctionalTests/WebAssembly/Browser/AOT/runtime.js
diff --git a/src/tests/FunctionalTests/wasm/Interpreter/browser/Program.cs b/src/tests/FunctionalTests/WebAssembly/Browser/NormalInterp/Program.cs
similarity index 100%
rename from src/tests/FunctionalTests/wasm/Interpreter/browser/Program.cs
rename to src/tests/FunctionalTests/WebAssembly/Browser/NormalInterp/Program.cs
diff --git a/src/tests/FunctionalTests/wasm/Interpreter/browser/Wasm.Interpreter.Browser.Test.csproj b/src/tests/FunctionalTests/WebAssembly/Browser/NormalInterp/WebAssembly.Browser.NormalInterp.Test.csproj
similarity index 100%
rename from src/tests/FunctionalTests/wasm/Interpreter/browser/Wasm.Interpreter.Browser.Test.csproj
rename to src/tests/FunctionalTests/WebAssembly/Browser/NormalInterp/WebAssembly.Browser.NormalInterp.Test.csproj
diff --git a/src/tests/FunctionalTests/wasm/Interpreter/browser/index.html b/src/tests/FunctionalTests/WebAssembly/Browser/NormalInterp/index.html
similarity index 100%
rename from src/tests/FunctionalTests/wasm/Interpreter/browser/index.html
rename to src/tests/FunctionalTests/WebAssembly/Browser/NormalInterp/index.html
diff --git a/src/tests/FunctionalTests/wasm/Interpreter/browser/runtime.js b/src/tests/FunctionalTests/WebAssembly/Browser/NormalInterp/runtime.js
similarity index 100%
rename from src/tests/FunctionalTests/wasm/Interpreter/browser/runtime.js
rename to src/tests/FunctionalTests/WebAssembly/Browser/NormalInterp/runtime.js
diff --git a/src/tests/FunctionalTests/wasm/AOT/console/Program.cs b/src/tests/FunctionalTests/WebAssembly/Console/AOT/Program.cs
similarity index 100%
rename from src/tests/FunctionalTests/wasm/AOT/console/Program.cs
rename to src/tests/FunctionalTests/WebAssembly/Console/AOT/Program.cs
diff --git a/src/tests/FunctionalTests/wasm/AOT/console/Wasm.Aot.Console.Test.csproj b/src/tests/FunctionalTests/WebAssembly/Console/AOT/WebAssembly.Console.AOT.Test.csproj
similarity index 100%
rename from src/tests/FunctionalTests/wasm/AOT/console/Wasm.Aot.Console.Test.csproj
rename to src/tests/FunctionalTests/WebAssembly/Console/AOT/WebAssembly.Console.AOT.Test.csproj
diff --git a/src/tests/FunctionalTests/wasm/Interpreter/console/Program.cs b/src/tests/FunctionalTests/WebAssembly/Console/NormalInterp/Program.cs
similarity index 100%
rename from src/tests/FunctionalTests/wasm/Interpreter/console/Program.cs
rename to src/tests/FunctionalTests/WebAssembly/Console/NormalInterp/Program.cs
diff --git a/src/tests/FunctionalTests/wasm/Interpreter/console/Wasm.Interpreter.Console.Test.csproj b/src/tests/FunctionalTests/WebAssembly/Console/NormalInterp/WebAssembly.Console.NormalInterp.Test.csproj
similarity index 100%
rename from src/tests/FunctionalTests/wasm/Interpreter/console/Wasm.Interpreter.Console.Test.csproj
rename to src/tests/FunctionalTests/WebAssembly/Console/NormalInterp/WebAssembly.Console.NormalInterp.Test.csproj
diff --git a/src/tests/FunctionalTests/wasm/Directory.Build.props b/src/tests/FunctionalTests/WebAssembly/Directory.Build.props
similarity index 100%
rename from src/tests/FunctionalTests/wasm/Directory.Build.props
rename to src/tests/FunctionalTests/WebAssembly/Directory.Build.props
diff --git a/src/tests/FunctionalTests/wasm/Directory.Build.targets b/src/tests/FunctionalTests/WebAssembly/Directory.Build.targets
similarity index 100%
rename from src/tests/FunctionalTests/wasm/Directory.Build.targets
rename to src/tests/FunctionalTests/WebAssembly/Directory.Build.targets
diff --git a/src/tests/FunctionalTests/wasm/Interpreter/toplevel/Program.cs b/src/tests/FunctionalTests/WebAssembly/TopLevel/NormalInterp/Program.cs
similarity index 100%
rename from src/tests/FunctionalTests/wasm/Interpreter/toplevel/Program.cs
rename to src/tests/FunctionalTests/WebAssembly/TopLevel/NormalInterp/Program.cs
diff --git a/src/tests/FunctionalTests/wasm/Interpreter/toplevel/Wasm.Interpreter.TopLevel.Test.csproj b/src/tests/FunctionalTests/WebAssembly/TopLevel/NormalInterp/WebAssembly.TopLevel.NormalInterp.Test.csproj
similarity index 100%
rename from src/tests/FunctionalTests/wasm/Interpreter/toplevel/Wasm.Interpreter.TopLevel.Test.csproj
rename to src/tests/FunctionalTests/WebAssembly/TopLevel/NormalInterp/WebAssembly.TopLevel.NormalInterp.Test.csproj

From a441f6bd46905303c55b169dbaeae095028c8251 Mon Sep 17 00:00:00 2001
From: Maxim Lipnin <v-maxlip@microsoft.com>
Date: Thu, 25 Feb 2021 13:12:20 +0300
Subject: [PATCH 2/3] Fix helix work item name patterns

---
 src/libraries/sendtohelixhelp.proj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj
index 72f36e7baa17c0..e9ac5fbefbc895 100644
--- a/src/libraries/sendtohelixhelp.proj
+++ b/src/libraries/sendtohelixhelp.proj
@@ -244,8 +244,8 @@
       <HelixCorrelationPayload Include="chromedriver" Uri="$(SeleniumUrl)" Condition="'$(TargetOS)' == 'Browser'" />
 
       <_WorkItem Include="$(WorkItemArchiveWildCard)" Exclude="$(HelixCorrelationPayload)" />
-      <_WorkItem Include="$(TestArchiveRoot)runonly/**/*.Console.Test.zip" Condition="'$(TargetOS)' == 'Browser' and '$(Scenario)' != 'WasmTestOnBrowser'" />
-      <_WorkItem Include="$(TestArchiveRoot)runonly/**/*.Browser.Test.zip" Condition="'$(TargetOS)' == 'Browser' and '$(Scenario)' == 'WasmTestOnBrowser'" />
+      <_WorkItem Include="$(TestArchiveRoot)runonly/**/WebAssembly.Console.*.Test.zip" Condition="'$(TargetOS)' == 'Browser' and '$(Scenario)' != 'WasmTestOnBrowser'" />
+      <_WorkItem Include="$(TestArchiveRoot)runonly/**/WebAssembly.Browser.*.Test.zip" Condition="'$(TargetOS)' == 'Browser' and '$(Scenario)' == 'WasmTestOnBrowser'" />
 
       <HelixWorkItem Include="@(_WorkItem -> '%(FileName)')">
         <PayloadArchive>%(Identity)</PayloadArchive>

From ce83027e2c49eb6ef4889047fda5632d0e8a2597 Mon Sep 17 00:00:00 2001
From: Maxim Lipnin <v-maxlip@microsoft.com>
Date: Thu, 25 Feb 2021 15:11:20 +0300
Subject: [PATCH 3/3] Fix binding

---
 src/tests/FunctionalTests/WebAssembly/Browser/AOT/index.html    | 2 +-
 .../FunctionalTests/WebAssembly/Browser/NormalInterp/index.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tests/FunctionalTests/WebAssembly/Browser/AOT/index.html b/src/tests/FunctionalTests/WebAssembly/Browser/AOT/index.html
index be9941b7aeb8d5..4fc5011771efdb 100644
--- a/src/tests/FunctionalTests/WebAssembly/Browser/AOT/index.html
+++ b/src/tests/FunctionalTests/WebAssembly/Browser/AOT/index.html
@@ -36,7 +36,7 @@ <h3 id="header">Wasm Browser Sample</h3>
 
       var App = {
         init: function () {
-          var ret = BINDING.call_static_method("[Wasm.Aot.Browser.Test] Sample.Test:TestMeaning", []);
+          var ret = BINDING.call_static_method("[WebAssembly.Browser.AOT.Test] Sample.Test:TestMeaning", []);
           document.getElementById("out").innerHTML = ret;
 
           if (is_testing)
diff --git a/src/tests/FunctionalTests/WebAssembly/Browser/NormalInterp/index.html b/src/tests/FunctionalTests/WebAssembly/Browser/NormalInterp/index.html
index 664dadcdb3ab4b..d2da22d24bfb27 100644
--- a/src/tests/FunctionalTests/WebAssembly/Browser/NormalInterp/index.html
+++ b/src/tests/FunctionalTests/WebAssembly/Browser/NormalInterp/index.html
@@ -36,7 +36,7 @@ <h3 id="header">Wasm Browser Sample</h3>
 
       var App = {
         init: function () {
-          var ret = BINDING.call_static_method("[Wasm.Interpreter.Browser.Test] Sample.Test:TestMeaning", []);
+          var ret = BINDING.call_static_method("[WebAssembly.Browser.NormalInterp.Test] Sample.Test:TestMeaning", []);
           document.getElementById("out").innerHTML = ret;
 
           if (is_testing)