From 23d465df2d4bacee34026c3b8940cccb1177521d Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Tue, 24 Sep 2024 11:28:54 +0200 Subject: [PATCH] disable browser debugger tests on CI --- .../common/evaluate-default-paths.yml | 16 ----- .../common/templates/wasm-debugger-tests.yml | 62 ------------------- .../runtime-extra-platforms-wasm.yml | 47 -------------- eng/pipelines/runtime.yml | 9 --- eng/testing/tests.browser.targets | 3 +- src/libraries/sendtohelix-browser.targets | 4 +- src/libraries/sendtohelix.proj | 12 +--- src/libraries/tests.proj | 9 +-- src/mono/browser/Makefile | 16 ----- .../Wasm.Debugger.Tests.csproj | 1 - .../Wasm.Debugger.Tests/wasm.helix.targets | 31 ---------- src/mono/wasi/Makefile | 10 --- 12 files changed, 5 insertions(+), 215 deletions(-) delete mode 100644 eng/pipelines/common/templates/wasm-debugger-tests.yml delete mode 100644 src/mono/browser/debugger/Wasm.Debugger.Tests/wasm.helix.targets diff --git a/eng/pipelines/common/evaluate-default-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml index 28991920c330d..b950e3a923b60 100644 --- a/eng/pipelines/common/evaluate-default-paths.yml +++ b/eng/pipelines/common/evaluate-default-paths.yml @@ -258,22 +258,6 @@ jobs: - ${{ parameters._const_paths._always_exclude }} - ${{ parameters._const_paths._perf_pipeline_specific_only }} - - subset: wasmdebuggertests - combined: true - include: - - ${{ parameters._const_paths._wasm_chrome }} - - src/libraries/System.Runtime.InteropServices/* - - src/libraries/System.Runtime.InteropServices.JavaScript/* - - src/mono/mono/* - - src/mono/browser/debugger/* - - src/mono/browser/runtime/* - - ${{ parameters._const_paths._wasm_src_native }} - - ${{ parameters._const_paths._wasm_pipelines }} - exclude: - - src/mono/nuget/* - - ${{ parameters._const_paths._always_exclude }} - - ${{ parameters._const_paths._perf_pipeline_specific_only }} - # 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 a61321809bc55..0000000000000 --- 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(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_tools_illink.containsChange'], true), - eq(stageDependencies.EvaluatePaths.evaluate_paths_outputs['DarcDependenciesChanged.Microsoft_DotNet_HotReload_Utils_Generator_BuildTool'], true), - eq(stageDependencies.EvaluatePaths.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 ea18dd02459c9..ee8843430470f 100644 --- a/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml +++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml @@ -55,17 +55,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: @@ -269,42 +258,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 - - # Active Issue https://github.com/dotnet/runtime/issues/98771 - # - template: /eng/pipelines/common/templates/wasm-debugger-tests.yml - # parameters: - # platforms: - # - Browser_wasm - # - Browser_wasm_win - # extraBuildArgs: /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 b70642261a2b9..d8fbadc7b0273 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -909,15 +909,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/eng/testing/tests.browser.targets b/eng/testing/tests.browser.targets index 8ece2d7b4b024..c39825004b9ec 100644 --- a/eng/testing/tests.browser.targets +++ b/eng/testing/tests.browser.targets @@ -246,9 +246,8 @@ '$(Scenario)' != 'WasmTestOnChrome' and '$(Scenario)' != 'WasmTestOnFirefox' and '$(Scenario)' != 'WasmTestOnNodeJS' and - '$(Scenario)' != 'WasmDebuggerTests' and '$(Scenario)' != 'BuildWasmApps'" - Text="Only supported scenarios are WasmTestOnV8, WasmTestOnNodeJS, WasmTestOnChrome, WasmTestOnFirefox, WasmDebuggerTests and BuildWasmApps at the moment. It was $(Scenario)." /> + Text="Only supported scenarios are WasmTestOnV8, WasmTestOnNodeJS, WasmTestOnChrome, WasmTestOnFirefox and BuildWasmApps at the moment. It was $(Scenario)." /> diff --git a/src/libraries/sendtohelix-browser.targets b/src/libraries/sendtohelix-browser.targets index dd69df76f31c5..7e0360f2f2a82 100644 --- a/src/libraries/sendtohelix-browser.targets +++ b/src/libraries/sendtohelix-browser.targets @@ -35,7 +35,6 @@ $(Scenario)-ST- $(Scenario)-MT- - true + Text="Only supported scenarios are WasmTestOnV8, WasmTestOnNodeJS, WasmTestOnChrome, WasmTestOnFirefox and BuildWasmApps at the moment. It was $(Scenario)." /> - <_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) @@ -109,14 +109,6 @@ - - <_DebuggerHostsItem Include="$(_DebuggerHosts.Split('/'))" /> - - <_WasmDebuggerTestsProjectsToBuild Include="$(PerScenarioProjectFile)"> - $(_PropertiesToPass);Scenario=WasmDebuggerTests;TestArchiveRuntimeFile=$(TestArchiveRuntimeFile);DebuggerHost=%(_DebuggerHostsItem.Identity) - - - <_TestUsingWorkloadsValues Include="false" /> @@ -128,7 +120,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 e0c341cc41e90..ccb671a5d52e5 100644 --- a/src/libraries/tests.proj +++ b/src/libraries/tests.proj @@ -25,7 +25,7 @@ false - true + true @@ -682,13 +682,6 @@ (('$(ContinuousIntegrationBuild)' == 'true' and '$(TestWasmBuildTests)' == 'true') or ('$(ContinuousIntegrationBuild)' != 'true' and '$(TestAssemblies)' == 'true'))" BuildInParallel="false" /> - - diff --git a/src/mono/browser/Makefile b/src/mono/browser/Makefile index 1401a1b36a431..3abcd3541657c 100644 --- a/src/mono/browser/Makefile +++ b/src/mono/browser/Makefile @@ -113,22 +113,6 @@ run-browser-tests-%: build-runtime-tests: $(TOP)/src/tests/build.sh -mono os browser wasm $(CONFIG) $(MSBUILD_ARGS) -build-debugger-tests-helix: - $(DOTNET) build -restore -bl:$(LOG_PATH)/Wasm.Debugger.Tests.binlog \ - /p:ContinuousIntegrationBuild=true /p:ArchiveTests=true \ - $(TOP)/src/mono/browser/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:$(LOG_PATH)/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/browser/debugger/Wasm.Debugger.Tests/Wasm.Debugger.Tests.csproj b/src/mono/browser/debugger/Wasm.Debugger.Tests/Wasm.Debugger.Tests.csproj index 008a633de7626..3183d12fb9d7b 100644 --- a/src/mono/browser/debugger/Wasm.Debugger.Tests/Wasm.Debugger.Tests.csproj +++ b/src/mono/browser/debugger/Wasm.Debugger.Tests/Wasm.Debugger.Tests.csproj @@ -16,7 +16,6 @@ BundleDebuggerTestsForHelix true $(Configuration) - wasm.helix.targets diff --git a/src/mono/browser/debugger/Wasm.Debugger.Tests/wasm.helix.targets b/src/mono/browser/debugger/Wasm.Debugger.Tests/wasm.helix.targets deleted file mode 100644 index 4c36a8937fc1f..0000000000000 --- a/src/mono/browser/debugger/Wasm.Debugger.Tests/wasm.helix.targets +++ /dev/null @@ -1,31 +0,0 @@ - - - true - 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)" - - - - diff --git a/src/mono/wasi/Makefile b/src/mono/wasi/Makefile index 13e2d9cb613ea..327bac18216ba 100644 --- a/src/mono/wasi/Makefile +++ b/src/mono/wasi/Makefile @@ -73,16 +73,6 @@ build-debugger-tests-helix: $(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) && \