Skip to content

Commit 36afe73

Browse files
pavelsavarailonatommy
authored and
pull[bot]
committed
[browser] stop testing runtime with nodejs (#108582)
* stop testing with nodejs * One condition, more readible. * Apply @kasperk81's feedback - this project is not used in WBT anymore. --------- Co-authored-by: Ilona Tomkowicz <itomkowicz@microsoft.com>
1 parent fd7661a commit 36afe73

34 files changed

Lines changed: 21 additions & 493 deletions

‎eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -92,33 +92,6 @@ jobs:
9292
- WasmTestOnV8
9393
- WasmTestOnChrome
9494

95-
# this only runs on the extra pipeline
96-
- template: /eng/pipelines/common/templates/wasm-library-tests.yml
97-
parameters:
98-
platforms:
99-
- browser_wasm
100-
nameSuffix: _NodeJs
101-
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
102-
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
103-
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
104-
alwaysRun: ${{ parameters.isWasmOnlyBuild }}
105-
scenarios:
106-
- WasmTestOnNodeJS
107-
108-
# Library tests - Windows - this only runs on the extra pipeline
109-
- template: /eng/pipelines/common/templates/wasm-library-tests.yml
110-
parameters:
111-
platforms:
112-
- browser_wasm_win
113-
nameSuffix: _NodeJs
114-
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
115-
# Don't run for rolling builds, as this is covered
116-
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
117-
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
118-
alwaysRun: ${{ parameters.isWasmOnlyBuild }}
119-
scenarios:
120-
- WasmTestOnNodeJS
121-
12295
# EAT Library tests - only run on linux
12396
- template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml
12497
parameters:
@@ -201,7 +174,6 @@ jobs:
201174
scenarios:
202175
- WasmTestOnChrome
203176
- WasmTestOnFirefox
204-
- WasmTestOnNodeJS
205177

206178
# # Hybrid Globalization AOT tests
207179
# # ActiveIssue: https://github.com/dotnet/runtime/issues/51746
@@ -218,7 +190,6 @@ jobs:
218190
# alwaysRun: true
219191
# scenarios:
220192
# - WasmTestOnChrome
221-
# - WasmTestOnNodeJS
222193

223194
- ${{ if and(ne(parameters.isRollingBuild, true), ne(parameters.excludeNonLibTests, true), ne(parameters.debuggerTestsOnly, true)) }}:
224195
# Builds only

‎eng/pipelines/runtime.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -850,7 +850,6 @@ extends:
850850
scenarios:
851851
- WasmTestOnChrome
852852
- WasmTestOnFirefox
853-
#- WasmTestOnNodeJS - this is not supported yet, https://github.com/dotnet/runtime/issues/85592
854853

855854
# EAT Library tests - only run on linux
856855
- template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml

‎eng/testing/WasmRunnerTemplate.cmd‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,24 +40,14 @@ if [%XHARNESS_COMMAND%] == [] (
4040

4141
if /I [%XHARNESS_COMMAND%] == [test] (
4242
if [%JS_ENGINE%] == [] (
43-
if /I [%SCENARIO%] == [WasmTestOnNodeJS] (
44-
set "JS_ENGINE=--engine^=NodeJS"
45-
) else (
46-
set "JS_ENGINE=--engine^=V8"
47-
)
43+
set "JS_ENGINE=--engine^=V8"
4844
)
4945
if [%MAIN_JS%] == [] (
5046
set "MAIN_JS=--js-file^=test-main.js"
5147
)
5248

5349
if [%JS_ENGINE_ARGS%] == [] (
54-
set "JS_ENGINE_ARGS=--engine-arg^=--stack-trace-limit^=1000"
55-
if /I NOT [%SCENARIO%] == [WasmTestOnNodeJS] (
56-
set "JS_ENGINE_ARGS=%JS_ENGINE_ARGS% --engine-arg^=--module"
57-
)
58-
if /I [%SCENARIO%] == [WasmTestOnNodeJS] (
59-
set "JS_ENGINE_ARGS=%JS_ENGINE_ARGS% --engine-arg^=--experimental-wasm-eh"
60-
)
50+
set "JS_ENGINE_ARGS=--engine-arg^=--stack-trace-limit^=1000 --engine-arg^=--module"
6151
)
6252
) else (
6353
if /I [%SCENARIO%] == [WasmTestOnChrome] (

‎eng/testing/WasmRunnerTemplate.sh‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,24 +41,11 @@ if [[ "$XHARNESS_COMMAND" == "test" ]]; then
4141
fi
4242

4343
if [[ -z "$JS_ENGINE_ARGS" ]]; then
44-
JS_ENGINE_ARGS="--engine-arg=--stack-trace-limit=1000"
45-
if [[ "$SCENARIO" != "WasmTestOnNodeJS" && "$SCENARIO" != "wasmtestonnodejs" ]]; then
46-
JS_ENGINE_ARGS="$JS_ENGINE_ARGS --engine-arg=--module"
47-
fi
48-
if [[ "$SCENARIO" == "WasmTestOnNodeJS" || "$SCENARIO" == "wasmtestonnodejs" ]]; then
49-
JS_ENGINE_ARGS="$JS_ENGINE_ARGS --engine-arg=--experimental-wasm-eh"
50-
fi
44+
JS_ENGINE_ARGS="--engine-arg=--stack-trace-limit=1000 --engine-arg=--module"
5145
fi
5246

5347
if [[ -z "$JS_ENGINE" ]]; then
54-
if [[ "$SCENARIO" == "WasmTestOnNodeJS" || "$SCENARIO" == "wasmtestonnodejs" ]]; then
55-
JS_ENGINE="--engine=NodeJS"
56-
else
57-
JS_ENGINE="--engine=V8"
58-
if [[ -n "$V8_PATH_FOR_TESTS" ]]; then
59-
JS_ENGINE_ARGS="$JS_ENGINE_ARGS --js-engine-path=$V8_PATH_FOR_TESTS"
60-
fi
61-
fi
48+
JS_ENGINE="--engine=V8"
6249
fi
6350
else
6451
if [[ "$SCENARIO" == "WasmTestOnChrome" || "$SCENARIO" == "wasmtestonchrome" ]]; then

‎eng/testing/tests.browser.targets‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -245,24 +245,17 @@
245245
<Error Condition="'$(Scenario)' != 'WasmTestOnV8' and
246246
'$(Scenario)' != 'WasmTestOnChrome' and
247247
'$(Scenario)' != 'WasmTestOnFirefox' and
248-
'$(Scenario)' != 'WasmTestOnNodeJS' and
249248
'$(Scenario)' != 'WasmDebuggerTests' and
250249
'$(Scenario)' != 'BuildWasmApps'"
251-
Text="Only supported scenarios are WasmTestOnV8, WasmTestOnNodeJS, WasmTestOnChrome, WasmTestOnFirefox, WasmDebuggerTests and BuildWasmApps at the moment. It was $(Scenario)." />
250+
Text="Only supported scenarios are WasmTestOnV8, WasmTestOnChrome, WasmTestOnFirefox, WasmDebuggerTests and BuildWasmApps at the moment. It was $(Scenario)." />
252251

253252
<!-- Restore NPM packages -->
254253
<ItemGroup Condition="'$(OS)' != 'Windows_NT'">
255-
<SetScriptCommands Include="if [[ &quot;$SCENARIO&quot; == &quot;WasmTestOnNodeJS&quot; || &quot;$SCENARIO&quot; == &quot;wasmtestonnodejs&quot; ]]; then export WasmXHarnessMonoArgs=&quot;$WasmXHarnessMonoArgs --setenv=NPM_MODULES=$(NodeNpmModuleString)&quot;; fi" />
256-
<RunScriptCommands Include="if [[ &quot;$SCENARIO&quot; == &quot;WasmTestOnNodeJS&quot; || &quot;$SCENARIO&quot; == &quot;wasmtestonnodejs&quot; ]]; then npm ci; fi" />
257-
258254
<SetScriptCommands Condition="'$(InstallChromeForTests)' == 'true' and '$(ChromeDriverBinaryPath)' != ''" Include="export PREPEND_PATH=$([System.IO.Path]::GetDirectoryName($(ChromeDriverBinaryPath)))" />
259255
<SetScriptCommands Condition="'$(InstallFirefoxForTests)' == 'true' and '$(GeckoDriverBinaryPath)' != ''" Include="export PREPEND_PATH=$([System.IO.Path]::GetDirectoryName($(GeckoDriverBinaryPath)))" />
260256
<SetScriptCommands Condition="'$(IsBrowserWasmProject)' == 'true'" Include="export RuntimeIdentifier=browser-wasm" />
261257
</ItemGroup>
262258
<ItemGroup Condition="'$(OS)' == 'Windows_NT'">
263-
<SetScriptCommands Include="if /I [%SCENARIO%]==[WasmTestOnNodeJS] ( set &quot;WasmXHarnessMonoArgs=%WasmXHarnessMonoArgs% --setenv=NPM_MODULES^=$(NodeNpmModuleString)&quot; )" />
264-
<RunScriptCommands Include="if /I [%SCENARIO%]==[WasmTestOnNodeJS] ( call npm ci )" />
265-
266259
<SetScriptCommands Condition="'$(InstallChromeForTests)' == 'true' and '$(ChromeDriverBinaryPath)' != ''" Include="set PREPEND_PATH=$([System.IO.Path]::GetDirectoryName($(ChromeDriverBinaryPath)))" />
267260
<SetScriptCommands Condition="'$(InstallFirefoxForTests)' == 'true' and '$(GeckoDriverBinaryPath)' != ''" Include="set PREPEND_PATH=$([System.IO.Path]::GetDirectoryName($(GeckoDriverBinaryPath)))" />
268261
<SetScriptCommands Condition="'$(IsBrowserWasmProject)' == 'true'" Include="set RuntimeIdentifier=browser-wasm" />

‎src/libraries/Common/tests/System/Net/Prerequisites/LocalEchoServer.helix.targets‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
<PropertyGroup Condition="'$(IsRunningLibraryTests)' == 'true' and
33
('$(Scenario)' == 'WasmTestOnV8' or
44
'$(Scenario)' == 'WasmTestOnChrome' or
5-
'$(Scenario)' == 'WasmTestOnFirefox' or
6-
'$(Scenario)' == 'WasmTestOnNodeJS')">
5+
'$(Scenario)' == 'WasmTestOnFirefox')">
76

87
<HelixExtensionTargets>$(HelixExtensionTargets);_AddMiddlewarePayload</HelixExtensionTargets>
98
<TestEchoMiddleware>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin', 'NetCoreServer', '$(Configuration)', '$(AspNetCoreAppCurrent)'))</TestEchoMiddleware>

‎src/libraries/Common/tests/System/Net/Prerequisites/LocalEchoServer.props‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,4 @@
3636
<Compile Include="$(CommonTestPath)System\Net\WebSockets\WebSocketStream.cs"
3737
Link="Common\System\Net\WebSockets\WebSocketStream.cs" />
3838
</ItemGroup>
39-
40-
41-
<!-- Tests use self-signed certificates that are refused by NodeJS -->
42-
<Target Name="AcceptUnauthorizedOnNodeJS" BeforeTargets="GenerateRunScript">
43-
<ItemGroup Condition="'$(OS)' != 'Windows_NT'">
44-
<SetScriptCommands Include="if [[ &quot;$SCENARIO&quot; == &quot;WasmTestOnNodeJS&quot; || &quot;$SCENARIO&quot; == &quot;wasmtestonnodejs&quot; ]]; then export NODE_TLS_REJECT_UNAUTHORIZED=0; fi" />
45-
</ItemGroup>
46-
<ItemGroup Condition="'$(OS)' == 'Windows_NT'">
47-
<SetScriptCommands Include="if /I [%SCENARIO%]==[WasmTestOnNodeJS] ( set &quot;NODE_TLS_REJECT_UNAUTHORIZED=0&quot; )" />
48-
</ItemGroup>
49-
</Target>
5039
</Project>

‎src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<PropertyGroup Condition="'$(TargetOS)' == 'browser'">
99
<!-- This doesn't run on V8 shell because https://bugs.chromium.org/p/v8/issues/detail?id=12541 -->
1010
<Scenario>WasmTestOnChrome</Scenario>
11-
<TestArchiveTestsRoot>$(TestArchiveRoot)browserornodejs/</TestArchiveTestsRoot>
11+
<TestArchiveTestsRoot>$(TestArchiveRoot)browseronly/</TestArchiveTestsRoot>
1212
<TestArchiveTestsDir>$(TestArchiveTestsRoot)$(OSPlatformConfig)/</TestArchiveTestsDir>
1313
<DefineConstants>$(DefineConstants);TARGET_BROWSER</DefineConstants>
1414
</PropertyGroup>

‎src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<PropertyGroup Condition="'$(TargetOS)' == 'browser'">
99
<!-- This doesn't run on V8 shell because https://bugs.chromium.org/p/v8/issues/detail?id=12541 -->
1010
<Scenario>WasmTestOnChrome</Scenario>
11-
<TestArchiveTestsRoot>$(TestArchiveRoot)browserornodejs/</TestArchiveTestsRoot>
11+
<TestArchiveTestsRoot>$(TestArchiveRoot)browseronly/</TestArchiveTestsRoot>
1212
<TestArchiveTestsDir>$(TestArchiveTestsRoot)$(OSPlatformConfig)/</TestArchiveTestsDir>
1313
<DefineConstants>$(DefineConstants);TARGET_BROWSER</DefineConstants>
1414
</PropertyGroup>

‎src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<PropertyGroup Condition="'$(TargetOS)' == 'browser'">
2222
<!-- This doesn't run on V8 because it lacks websocket support -->
2323
<Scenario>WasmTestOnChrome</Scenario>
24-
<TestArchiveTestsRoot>$(TestArchiveRoot)browserornodejs/</TestArchiveTestsRoot>
24+
<TestArchiveTestsRoot>$(TestArchiveRoot)browseronly/</TestArchiveTestsRoot>
2525
<TestArchiveTestsDir>$(TestArchiveTestsRoot)$(OSPlatformConfig)/</TestArchiveTestsDir>
2626
<DefineConstants>$(DefineConstants);TARGET_BROWSER</DefineConstants>
2727
<!-- This WASM test is slow on NodeJS. This sets the xharness timeout but there is also override in sendtohelix-browser.targets -->

0 commit comments

Comments
 (0)