[wasm] Enable WasmTemplateTests on CI (#64589)

dotnet · Feb 3, 2022 · ee5e6be · ee5e6be
1 parent 7550df8
commit ee5e6be
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/eng/pipelines/common/evaluate-default-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml
@@ -116,6 +116,9 @@ jobs:
       - src/mono/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/*
       - src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/*
       - src/mono/mono/*
+      - eng/testing/scenarios/BuildWasmAppsJobsList.txt
+      - eng/Version.Details.xml
+      - src/mono/wasm/emscripten-version.txt
     - subset: wasmdebuggertests
       include:
       - src/mono/wasm/debugger/*

diff --git a/eng/testing/scenarios/BuildWasmAppsJobsList.txt b/eng/testing/scenarios/BuildWasmAppsJobsList.txt
@@ -17,3 +17,4 @@ Wasm.Build.Tests.SatelliteAssembliesTests
 Wasm.Build.Tests.WasmBuildAppTest
 Wasm.Build.Tests.WasmNativeDefaultsTests
 Wasm.Build.Tests.WorkloadTests
+Wasm.Build.Tests.WasmTemplateTests
diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/WasmTemplateTests.cs b/src/tests/BuildWasmApps/Wasm.Build.Tests/WasmTemplateTests.cs
@@ -18,7 +18,7 @@ public WasmTemplateTests(ITestOutputHelper output, SharedBuildPerTestClassFixtur
         {
         }
 
-        [Theory]
+        [ConditionalTheory(typeof(BuildTestBase), nameof(IsUsingWorkloads))]
         [InlineData("Debug")]
         [InlineData("Release")]
         public void BrowserBuildThenPublish(string config)
@@ -61,7 +61,7 @@ public void BrowserBuildThenPublish(string config)
                             UseCache: false));
         }
 
-        [Theory]
+        [ConditionalTheory(typeof(BuildTestBase), nameof(IsUsingWorkloads))]
         [InlineData("Debug")]
         [InlineData("Release")]
         public void ConsoleBuildThenPublish(string config)
@@ -76,10 +76,10 @@ public void ConsoleBuildThenPublish(string config)
             BuildProject(buildArgs,
                         id: id,
                         new BuildProjectOptions(
-                        DotnetWasmFromRuntimePack: false,
+                        DotnetWasmFromRuntimePack: true,
                         CreateProject: false,
                         HasV8Script: false,
-                        MainJS: "main.mjs",
+                        MainJS: "main.cjs",
                         Publish: false,
                         TargetFramework: "net7.0"
                         ));
@@ -92,13 +92,14 @@ public void ConsoleBuildThenPublish(string config)
             _testOutput.WriteLine($"{Environment.NewLine}Publishing with no changes ..{Environment.NewLine}");
             Console.WriteLine($"{Environment.NewLine}Publishing with no changes ..{Environment.NewLine}");
 
+            bool expectRelinking = config == "Release";
             BuildProject(buildArgs,
                         id: id,
                         new BuildProjectOptions(
-                            DotnetWasmFromRuntimePack: false,
+                            DotnetWasmFromRuntimePack: !expectRelinking,
                             CreateProject: false,
                             HasV8Script: false,
-                            MainJS: "main.mjs",
+                            MainJS: "main.cjs",
                             Publish: true,
                             TargetFramework: "net7.0",
                             UseCache: false));