From 8a7fa48169e18c9b8e480d759efa0e1564c0ca49 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com>
Date: Mon, 14 Oct 2024 16:03:17 +0200
Subject: [PATCH] Rename `WasmBuildTests` settings to the names of properties
they impact (#108780)
* Rename
---
src/libraries/sendtohelix-browser.targets | 2 +-
src/libraries/sendtohelix-wasm.targets | 8 ++++----
src/libraries/sendtohelix.proj | 4 ++--
src/libraries/sendtohelixhelp.proj | 6 +++---
src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj | 10 +++++-----
.../wasm/Wasm.Build.Tests/data/RunScriptTemplate.cmd | 4 ++--
.../wasm/Wasm.Build.Tests/data/RunScriptTemplate.sh | 4 ++--
7 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/libraries/sendtohelix-browser.targets b/src/libraries/sendtohelix-browser.targets
index d52913fdaa8b4..eb030e64c76b8 100644
--- a/src/libraries/sendtohelix-browser.targets
+++ b/src/libraries/sendtohelix-browser.targets
@@ -138,7 +138,7 @@
$(RepositoryEngineeringDir)testing\scenarios\BuildWasmAppsJobsList.txt
<_XUnitTraitArg Condition="'$(TestUsingWorkloads)' == 'true'">-notrait category=no-workload
<_XUnitTraitArg Condition="'$(TestUsingWorkloads)' != 'true'">-trait category=no-workload
- <_XUnitTraitArg Condition="'$(TestUsingFingerprinting)' == 'false'">$(_XUnitTraitArg) -trait category=no-fingerprinting
+ <_XUnitTraitArg Condition="'$(WasmFingerprintAssets)' == 'false'">$(_XUnitTraitArg) -trait category=no-fingerprinting
diff --git a/src/libraries/sendtohelix-wasm.targets b/src/libraries/sendtohelix-wasm.targets
index 23fb50e216f09..f92b17d4fc972 100644
--- a/src/libraries/sendtohelix-wasm.targets
+++ b/src/libraries/sendtohelix-wasm.targets
@@ -12,8 +12,8 @@
Workloads-
NoWorkload-
- $(WorkItemPrefix)NoWebcil-
- $(WorkItemPrefix)NoFingerprint-
+ NoWebcil-
+ NoFingerprint-
$(WorkItemPrefix)ST-
$(WorkItemPrefix)MT-
@@ -50,7 +50,7 @@
-
+
$(_BuildWasmAppsPayloadArchive)
set "HELIX_XUNIT_ARGS=-class %(Identity)"
export "HELIX_XUNIT_ARGS=-class %(Identity)"
@@ -58,7 +58,7 @@
$(_workItemTimeout)
-
+
$(_BuildWasmAppsPayloadArchive)
$(HelixCommand)
$(_workItemTimeout)
diff --git a/src/libraries/sendtohelix.proj b/src/libraries/sendtohelix.proj
index 999d8ed9d61c7..45a5091970398 100644
--- a/src/libraries/sendtohelix.proj
+++ b/src/libraries/sendtohelix.proj
@@ -83,7 +83,7 @@
-
+
<_TestUsingWorkloadsValues Include="true;false" />
<_TestUsingWebcilValues Include="true;false" Condition="'$(TargetOS)' == 'browser'" />
@@ -104,7 +104,7 @@
<_TestUsingCrossProductValues Remove="@(_TestUsingCrossProductValues)" Condition="'%(_TestUsingCrossProductValues.Workloads)' == 'false' and '%(_TestUsingCrossProductValues.Fingerprinting)' == 'false'" />
<_BuildWasmAppsProjectsToBuild Include="$(PerScenarioProjectFile)">
- $(_PropertiesToPass);Scenario=BuildWasmApps;TestArchiveRuntimeFile=$(TestArchiveRuntimeFile);TestUsingWorkloads=%(_TestUsingCrossProductValues.Workloads);TestUsingWebcil=%(_TestUsingCrossProductValues.Webcil);TestUsingFingerprinting=%(_TestUsingCrossProductValues.Fingerprinting)
+ $(_PropertiesToPass);Scenario=BuildWasmApps;TestArchiveRuntimeFile=$(TestArchiveRuntimeFile);TestUsingWorkloads=%(_TestUsingCrossProductValues.Workloads);WasmEnableWebcil=%(_TestUsingCrossProductValues.Webcil);WasmFingerprintAssets=%(_TestUsingCrossProductValues.Fingerprinting)
%(_BuildWasmAppsProjectsToBuild.AdditionalProperties);NeedsToBuildWasmAppsOnHelix=$(NeedsToBuildWasmAppsOnHelix)
diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj
index d6b2a3bf75c4d..b01079ab6f07d 100644
--- a/src/libraries/sendtohelixhelp.proj
+++ b/src/libraries/sendtohelixhelp.proj
@@ -157,8 +157,8 @@
-
-
+
+
@@ -348,7 +348,7 @@
+ Text="Scenario: $(Scenario), TestUsingWorkloads: $(TestUsingWorkloads), WasmEnableWebcil: $(WasmEnableWebcil), WasmFingerprintAssets: $(WasmFingerprintAssets)" />
diff --git a/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj b/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj
index 9a24ca0dac83b..2edeb6e0a1449 100644
--- a/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj
+++ b/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj
@@ -96,7 +96,7 @@
<_XUnitTraitArg Condition="'$(TestUsingWorkloads)' == 'true'">-notrait category=no-workload
<_XUnitTraitArg Condition="'$(TestUsingWorkloads)' != 'true'">-trait category=no-workload
- <_XUnitTraitArg Condition="'$(TestUsingFingerprinting)' == 'false'">-trait category=no-fingerprinting
+ <_XUnitTraitArg Condition="'$(WasmFingerprintAssets)' == 'false'">-trait category=no-fingerprinting
@@ -112,11 +112,11 @@
-
-
+
+
-
-
+
+
diff --git a/src/mono/wasm/Wasm.Build.Tests/data/RunScriptTemplate.cmd b/src/mono/wasm/Wasm.Build.Tests/data/RunScriptTemplate.cmd
index fc66d9e745a06..6cbf9b15d78cc 100644
--- a/src/mono/wasm/Wasm.Build.Tests/data/RunScriptTemplate.cmd
+++ b/src/mono/wasm/Wasm.Build.Tests/data/RunScriptTemplate.cmd
@@ -51,12 +51,12 @@ if [%TEST_USING_WORKLOADS%] == [true] (
) else (
set SDK_HAS_WORKLOAD_INSTALLED=false
)
-if [%TEST_USING_WEBCIL%] == [false] (
+if [%WASM_ENABLE_WEBCIL%] == [false] (
set USE_WEBCIL_FOR_TESTS=false
) else (
set USE_WEBCIL_FOR_TESTS=true
)
-if [%TEST_USING_FINGERPRINTING%] == [false] (
+if [%WASM_FINGERPRINT_ASSETS%] == [false] (
set USE_FINGERPRINTING_FOR_TESTS=false
) else (
set USE_FINGERPRINTING_FOR_TESTS=true
diff --git a/src/mono/wasm/Wasm.Build.Tests/data/RunScriptTemplate.sh b/src/mono/wasm/Wasm.Build.Tests/data/RunScriptTemplate.sh
index bab35b29d534a..cfbcda4a64307 100644
--- a/src/mono/wasm/Wasm.Build.Tests/data/RunScriptTemplate.sh
+++ b/src/mono/wasm/Wasm.Build.Tests/data/RunScriptTemplate.sh
@@ -33,13 +33,13 @@ function set_env_vars()
export SDK_HAS_WORKLOAD_INSTALLED=false
fi
- if [ "x$TEST_USING_WEBCIL" = "xfalse" ]; then
+ if [ "x$WASM_ENABLE_WEBCIL" = "xfalse" ]; then
export USE_WEBCIL_FOR_TESTS=false
else
export USE_WEBCIL_FOR_TESTS=true
fi
- if [ "x$TEST_USING_FINGERPRINTING" = "xfalse" ]; then
+ if [ "x$WASM_FINGERPRINT_ASSETS" = "xfalse" ]; then
export USE_FINGERPRINTING_FOR_TESTS=false
else
export USE_FINGERPRINTING_FOR_TESTS=true