diff --git a/eng/pipelines/common/evaluate-default-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml
index 0e4279a9697b94..198e5bdf23b272 100644
--- a/eng/pipelines/common/evaluate-default-paths.yml
+++ b/eng/pipelines/common/evaluate-default-paths.yml
@@ -212,21 +212,6 @@ jobs:
exclude:
- ${{ parameters._const_paths._always_exclude }}
- - subset: wasmdebuggertests
- combined: true
- include:
- - eng/testing/ProvisioningVersions.props
- - src/libraries/System.Runtime.InteropServices/*
- - src/libraries/System.Runtime.InteropServices.JavaScript/*
- - src/mono/mono/*
- - src/mono/wasm/debugger/*
- - src/mono/wasm/runtime/*
- - ${{ parameters._const_paths._wasm_src_native }}
- - ${{ parameters._const_paths._wasm_pipelines }}
- exclude:
- - src/mono/nuget/*
- - ${{ parameters._const_paths._always_exclude }}
-
# wasm/runtimetests need to be run
- subset: wasm_runtimetests
combined: true
diff --git a/eng/pipelines/common/templates/wasm-debugger-tests.yml b/eng/pipelines/common/templates/wasm-debugger-tests.yml
deleted file mode 100644
index 17c0f415cf1b44..00000000000000
--- a/eng/pipelines/common/templates/wasm-debugger-tests.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-parameters:
- alwaysRun: false
- isExtraPlatformsBuild: false
- isWasmOnlyBuild: false
- browser: 'chrome'
- shouldContinueOnError: false
- runOnlyOnWasmOnlyPipelines: false
- extraBuildArgs: ''
- nameSuffix: ''
- platforms: []
-
-jobs:
-
-# Wasm debugger tests - windows
-- template: /eng/pipelines/common/platform-matrix.yml
- parameters:
- jobTemplate: /eng/pipelines/common/global-build-job.yml
- helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
- buildConfig: Release
- runtimeFlavor: mono
- platforms: ${{ parameters.platforms }}
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- variables:
- # map dependencies variables to local variables
- - name: alwaysRunVar
- value: ${{ parameters.alwaysRun }}
- - name: shouldRunOnDefaultPipelines
- value: $[
- or(
- eq(variables['wasmDarcDependenciesChanged'], true),
- eq(dependencies.evaluate_paths.outputs['SetPathVars_tools_illink.containsChange'], true),
- eq(dependencies.evaluate_paths_outputs['DarcDependenciesChanged.Microsoft_DotNet_HotReload_Utils_Generator_BuildTool'], true),
- eq(dependencies.evaluate_paths.outputs['SetPathVars_wasmdebuggertests.containsChange'], true))
- ]
- jobParameters:
- testGroup: innerloop
- isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
- ${{ if eq(parameters.nameSuffix, '') }}:
- nameSuffix: Mono_DebuggerTests_${{ parameters.browser }}
- ${{ else }}:
- nameSuffix: ${{ parameters.nameSuffix }}
- buildArgs: -s mono+libs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:TestWasmDebuggerTests=true /p:TestAssemblies=false /p:BrowserHost=$(_hostedOs) /p:DebuggerHost=${{ parameters.browser }} ${{ parameters.extraBuildArgs }}
- timeoutInMinutes: 180
- # if !alwaysRun, then:
- # if this is runtime-wasm (isWasmOnlyBuild):
- # - then run only if it would not have run on default pipelines (based
- # on path changes)
- # - else run based on path changes
- condition: >-
- or(
- eq(variables['alwaysRunVar'], true),
- and(
- eq(variables['isDefaultPipeline'], variables['shouldRunOnDefaultPipelines']),
- eq(${{ parameters.isWasmOnlyBuild }}, ${{ parameters.runOnlyOnWasmOnlyPipelines }})))
- postBuildSteps:
- - template: /eng/pipelines/libraries/helix.yml
- parameters:
- creator: dotnet-bot
- testRunNamePrefixSuffix: Mono_${{ parameters.browser }}_$(_BuildConfig)
- extraHelixArguments: /p:BrowserHost=$(_hostedOs) /p:_DebuggerHosts=${{ parameters.browser }}
- scenarios:
- - wasmdebuggertests
diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml
index 3c5df807855b0d..0e526a82d7fc4b 100644
--- a/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml
+++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml
@@ -43,17 +43,6 @@ jobs:
runAOT: true
alwaysRun: true
- # Wasm Debugger tests - firefox
- - template: /eng/pipelines/common/templates/wasm-debugger-tests.yml
- parameters:
- platforms:
- - browser_wasm_firefox
- browser: firefox
- extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
- ## ff tests are unstable currently
- shouldContinueOnError: true
- alwaysRun: true
-
# Disabled for now
#- template: /eng/pipelines/coreclr/perf-wasm-jobs.yml
#parameters:
@@ -214,41 +203,6 @@ jobs:
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
-- ${{ if and(ne(parameters.isRollingBuild, true), or(ne(parameters.excludeNonLibTests, true), eq(parameters.debuggerTestsOnly, true))) }}:
- # Debugger tests
- - template: /eng/pipelines/common/templates/wasm-debugger-tests.yml
- parameters:
- platforms:
- - browser_wasm
- - browser_wasm_win
- extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
- isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
- isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
-
- - template: /eng/pipelines/common/templates/wasm-debugger-tests.yml
- parameters:
- platforms:
- - browser_wasm_firefox
- browser: firefox
- extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
- isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
- isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
- alwaysRun: ${{ parameters.isWasmOnlyBuild }}
- # ff tests are unstable currently
- shouldContinueOnError: true
-
- - template: /eng/pipelines/common/templates/wasm-debugger-tests.yml
- parameters:
- platforms:
- - Browser_wasm
- - Browser_wasm_win
- extraBuildArgs: /p:MonoWasmBuildVariant=multithread /p:WasmEnableThreads=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
- nameSuffix: DebuggerTests_MultiThreaded
- alwaysRun: ${{ parameters.isWasmOnlyBuild }}
- isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
- isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
- runOnlyOnWasmOnlyPipelines: true
-
# Disable for now
#- template: /eng/pipelines/coreclr/perf-wasm-jobs.yml
#parameters:
diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
index a21a15db4208d7..4c0dfa762c3ad3 100644
--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -529,15 +529,6 @@ extends:
alwaysRun: ${{ variables.isRollingBuild }}
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
- # Wasm Debugger tests
- - template: /eng/pipelines/common/templates/wasm-debugger-tests.yml
- parameters:
- platforms:
- - browser_wasm
- - browser_wasm_win
- alwaysRun: ${{ variables.isRollingBuild }}
- extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
-
# Wasm runtime tests
- template: /eng/pipelines/common/templates/wasm-runtime-tests.yml
parameters:
diff --git a/src/libraries/sendtohelix-wasm.targets b/src/libraries/sendtohelix-wasm.targets
index 89326207f9401e..7988e9520c6525 100644
--- a/src/libraries/sendtohelix-wasm.targets
+++ b/src/libraries/sendtohelix-wasm.targets
@@ -36,7 +36,6 @@
<_ShippingPackagesPath>$([MSBuild]::NormalizeDirectory($(ArtifactsDir), 'packages', $(Configuration), 'Shipping'))
$(Scenario)-
- true
true
diff --git a/src/libraries/sendtohelix.proj b/src/libraries/sendtohelix.proj
index 354064b4dc014d..4b0d024087fe65 100644
--- a/src/libraries/sendtohelix.proj
+++ b/src/libraries/sendtohelix.proj
@@ -72,7 +72,7 @@
<_Scenarios Include="$(_Scenarios.Split(','))" />
- <_BaseProjectsToBuild Include="$(PerScenarioProjectFile)" Condition="'%(_Scenarios.Identity)' != 'buildwasmapps' and '%(_Scenarios.Identity)' != 'buildiosapps' and '%(_Scenarios.Identity)' != 'wasmdebuggertests'">
+ <_BaseProjectsToBuild Include="$(PerScenarioProjectFile)" Condition="'%(_Scenarios.Identity)' != 'buildwasmapps' and '%(_Scenarios.Identity)' != 'buildiosapps'">
$(_PropertiesToPass);Scenario=%(_Scenarios.Identity);TestArchiveRuntimeFile=$(TestArchiveRuntimeFile)
%(_BaseProjectsToBuild.AdditionalProperties);NeedsToBuildWasmAppsOnHelix=$(NeedsToBuildWasmAppsOnHelix)
@@ -97,14 +97,6 @@
-
- <_DebuggerHostsItem Include="$(_DebuggerHosts.Split('/'))" />
-
- <_WasmDebuggerTestsProjectsToBuild Include="$(PerScenarioProjectFile)">
- $(_PropertiesToPass);Scenario=WasmDebuggerTests;TestArchiveRuntimeFile=$(TestArchiveRuntimeFile);DebuggerHost=%(_DebuggerHostsItem.Identity)
-
-
-
<_TestUsingWorkloadsValues Include="false" />
@@ -116,7 +108,7 @@
- <_ProjectsToBuild Include="@(_BuildWasmAppsProjectsToBuild);@(_WasmDebuggerTestsProjectsToBuild);@(_BuildiOSAppsProjectsToBuild);@(_BaseProjectsToBuild)" />
+ <_ProjectsToBuild Include="@(_BuildWasmAppsProjectsToBuild);@(_BuildiOSAppsProjectsToBuild);@(_BaseProjectsToBuild)" />
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index 797c1f4f325d01..c0eaf2b651c1f0 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -25,7 +25,7 @@
false
- true
+ true
@@ -621,13 +621,6 @@
(('$(ContinuousIntegrationBuild)' == 'true' and '$(TestWasmBuildTests)' == 'true') or
('$(ContinuousIntegrationBuild)' != 'true' and '$(TestAssemblies)' == 'true'))"
BuildInParallel="false" />
-
-
diff --git a/src/mono/wasi/Makefile b/src/mono/wasi/Makefile
index 9cd33abfa2f003..4b2700bdc6dd51 100644
--- a/src/mono/wasi/Makefile
+++ b/src/mono/wasi/Makefile
@@ -63,22 +63,6 @@ run-tests-%:
run-build-tests:
WASI_SDK_PATH=$(WASI_SDK_PATH) $(DOTNET) build $(TOP)/src/mono/wasi//Wasi.Build.Tests/ /t:Test /bl $(_MSBUILD_WASM_BUILD_ARGS) $(MSBUILD_ARGS)
-build-debugger-tests-helix:
- $(DOTNET) build -restore -bl:$(TOP)/artifacts/log/$(CONFIG)/Wasm.Debugger.Tests.binlog \
- /p:ContinuousIntegrationBuild=true /p:ArchiveTests=true \
- $(TOP)/src/mono/wasm/debugger/Wasm.Debugger.Tests/Wasm.Debugger.Tests.csproj \
- $(_MSBUILD_WASM_BUILD_ARGS) $(MSBUILD_ARGS)
-
-submit-debugger-tests-helix: build-debugger-tests-helix
- BUILD_REASON=wasm-test SYSTEM_TEAMPROJECT=public BUILD_REPOSITORY_NAME=dotnet/runtime BUILD_SOURCEBRANCH=main \
- $(TOP)/eng/common/msbuild.sh --ci -restore $(TOP)/src/libraries/sendtohelix.proj \
- /p:TestRunNamePrefixSuffix=WasmDebugger /p:HelixBuild=`date "+%Y%m%d.%H%M"` /p:Creator=`whoami` \
- /bl:$(TOP)/artifacts/log/$(CONFIG)/SendToHelix.binlog -p:HelixTargetQueue=$(HELIX_TARGET_QUEUE) \
- /p:RuntimeFlavor=mono /p:TargetRuntimeIdentifier= /p:MonoForceInterpreter= /p:TestScope=innerloop \
- /p:_Scenarios=wasmdebuggertests \
- $(_MSBUILD_WASM_BUILD_ARGS) \
- $(MSBUILD_ARGS)
-
submit-wbt-helix:
PATH="$(JSVU):$(PATH)" \
$(DOTNET) build $(TOP)/src/mono/wasi/Wasi.Build.Tests/ /v:m /p:ArchiveTests=true /t:ArchiveTests $(_MSBUILD_WASM_BUILD_ARGS) $(MSBUILD_ARGS) && \
diff --git a/src/mono/wasm/Makefile b/src/mono/wasm/Makefile
index a145d600687b95..bb7e126c229927 100644
--- a/src/mono/wasm/Makefile
+++ b/src/mono/wasm/Makefile
@@ -111,22 +111,6 @@ run-browser-tests-%:
build-runtime-tests:
$(TOP)/src/tests/build.sh -mono os browser wasm $(CONFIG)
-build-debugger-tests-helix:
- $(DOTNET) build -restore -bl:$(TOP)/artifacts/log/$(CONFIG)/Wasm.Debugger.Tests.binlog \
- /p:ContinuousIntegrationBuild=true /p:ArchiveTests=true \
- $(TOP)/src/mono/wasm/debugger/Wasm.Debugger.Tests/Wasm.Debugger.Tests.csproj \
- $(_MSBUILD_WASM_BUILD_ARGS) $(MSBUILD_ARGS)
-
-submit-debugger-tests-helix: build-debugger-tests-helix
- EMSDK_PATH=$(EMSDK_PATH) BUILD_REASON=wasm-test SYSTEM_TEAMPROJECT=public BUILD_REPOSITORY_NAME=dotnet/runtime BUILD_SOURCEBRANCH=main \
- $(TOP)/eng/common/msbuild.sh --ci -restore $(TOP)/src/libraries/sendtohelix.proj \
- /p:TestRunNamePrefixSuffix=WasmDebugger /p:HelixBuild=`date "+%Y%m%d.%H%M"` /p:Creator=`whoami` \
- /bl:$(TOP)/artifacts/log/$(CONFIG)/SendToHelix.binlog -p:HelixTargetQueue=$(HELIX_TARGET_QUEUE) \
- /p:RuntimeFlavor=mono /p:TargetRuntimeIdentifier= /p:MonoForceInterpreter= /p:TestScope=innerloop \
- /p:_Scenarios=wasmdebuggertests \
- $(_MSBUILD_WASM_BUILD_ARGS) \
- $(MSBUILD_ARGS)
-
submit-wbt-helix:
PATH="$(JSVU):$(PATH)" \
$(DOTNET) build $(TOP)/src/mono/wasm/Wasm.Build.Tests/ /v:m /p:ArchiveTests=true /t:ArchiveTests $(_MSBUILD_WASM_BUILD_ARGS) $(MSBUILD_ARGS) && \
diff --git a/src/mono/wasm/debugger/Wasm.Debugger.Tests/Wasm.Debugger.Tests.csproj b/src/mono/wasm/debugger/Wasm.Debugger.Tests/Wasm.Debugger.Tests.csproj
index 6c2ce61fee7c0a..632890bd15e0bd 100644
--- a/src/mono/wasm/debugger/Wasm.Debugger.Tests/Wasm.Debugger.Tests.csproj
+++ b/src/mono/wasm/debugger/Wasm.Debugger.Tests/Wasm.Debugger.Tests.csproj
@@ -16,7 +16,6 @@
BundleDebuggerTestsForHelix
true
$(Configuration)
- wasm.helix.targets
diff --git a/src/mono/wasm/debugger/Wasm.Debugger.Tests/wasm.helix.targets b/src/mono/wasm/debugger/Wasm.Debugger.Tests/wasm.helix.targets
deleted file mode 100644
index e645a2c42c4d5d..00000000000000
--- a/src/mono/wasm/debugger/Wasm.Debugger.Tests/wasm.helix.targets
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
- true
- $(DebuggerHost)-
- true
- <_DebuggerTestsWorkItemTimeout Condition="'$(Scenario)' == 'WasmDebuggerTests'">00:50:00
- <_DebuggerTestsWorkItemTimeout Condition="'$(Scenario)' == 'WasmDebuggerTests' and '$(BrowserHost)' == 'windows'">00:50:00
-
- $(HelixExtensionTargets);_AddWorkItemsForWasmDebuggerTests
-
-
-
-
-
-
-
-
-
-
-
-
- $(TestArchiveTestsDir)Wasm.Debugger.Tests.zip
- $(HelixCommand)
- $(_DebuggerTestsWorkItemTimeout)
- set "TEST_ARGS=--filter category^^!=failing^&FullyQualifiedName~%(Identity)"
- export "TEST_ARGS=--filter category!=failing&FullyQualifiedName~%(Identity)"
-
-
-
-