From 39f14c5ecf2b71397002315a6c13ddbfabcd76c9 Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Wed, 4 Aug 2021 11:30:55 -0400
Subject: [PATCH] [wasm] Build Wasm.Build.Tests only on the WBT job, on CI
 (#56769)

* [wasm] Build Wasm.Build.Tests only on the WBT job, on CI

* Update eng/pipelines/runtime.yml

Co-authored-by: Larry Ewing <lewing@microsoft.com>

* Address review feedback

Co-authored-by: Larry Ewing <lewing@microsoft.com>
---
 eng/pipelines/runtime.yml | 2 +-
 src/libraries/tests.proj  | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
index 2ae3399..f21c7e8 100644
--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -324,7 +324,7 @@ jobs:
     jobParameters:
       testGroup: innerloop
       nameSuffix: AllSubsets_Mono_WasmBuildTests
-      buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true
+      buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:OnlyWasmBuildTests=true /p:TestAssemblies=false
       timeoutInMinutes: 180
       condition: >-
         or(
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index 73f74bc..ebb11e1 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -340,7 +340,9 @@
     <!-- wasm.build.tests are run on non-aot regular run -->
     <ProjectReference Include="$(RepoRoot)\src\tests\BuildWasmApps\**\*.Tests.csproj"
                       Exclude="@(ProjectExclusions)"
-                      Condition="'$(TargetOS)' == 'Browser' and '$(BuildAOTTestsOnHelix)' != 'true' and '$(TestAssemblies)' == 'true'"
+                      Condition="'$(TargetOS)' == 'Browser' and
+                                    (('$(ContinuousIntegrationBuild)' == 'true' and '$(OnlyWasmBuildTests)' == 'true') or
+                                     ('$(ContinuousIntegrationBuild)' != 'true' and '$(TestAssemblies)' == 'true'))"
                       BuildInParallel="false" />
   </ItemGroup>
 
@@ -367,8 +369,8 @@
                       BuildInParallel="false" />
   </ItemGroup>
 
-  <!-- Don't build samples, and functional tests on EAT, and AOT lanes -->
-  <ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(TargetOS)' == 'Browser' and '$(BuildAOTTestsOnHelix)' != 'true'">
+  <!-- Don't build samples, and functional tests on EAT, AOT, and WBT lanes -->
+  <ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(TargetOS)' == 'Browser' and '$(BuildAOTTestsOnHelix)' != 'true' and '$(OnlyWasmBuildTests)' != 'true'">
     <ProjectReference Include="$(MonoProjectRoot)sample\wasm\**\*.Sample.csproj"
                       Exclude="@(ProjectExclusions)"
                       BuildInParallel="true" />
-- 
2.7.4