File tree 4 files changed +4
-4
lines changed
src/libraries/System.Text.Json/tests/System.Text.Json.Tests
4 files changed +4
-4
lines changed Original file line number Diff line number Diff line change 109
109
<_XHarnessArgs Condition =" '$(_UseWasmSymbolicator)' == 'true'" >$(_XHarnessArgs) --symbol-patterns wasm-symbol-patterns.txt</_XHarnessArgs >
110
110
<_XHarnessArgs Condition =" '$(_UseWasmSymbolicator)' == 'true'" >$(_XHarnessArgs) --symbolicator WasmSymbolicator.dll,Microsoft.WebAssembly.Internal.SymbolicatorWrapperForXHarness</_XHarnessArgs >
111
111
<_XHarnessArgs Condition =" '$(_WasmBrowserPathForTests)' != ''" >$(_XHarnessArgs) " --browser-path=$(_WasmBrowserPathForTests)" </_XHarnessArgs >
112
- <_XHarnessArgs Condition =" '$(_XHarnessTestsTimeout )' != '' " >$(_XHarnessArgs) " --timeout=$(_XHarnessTestsTimeout )" </_XHarnessArgs >
112
+ <_XHarnessArgs Condition =" '$(WasmXHarnessTestsTimeout )' != ''" >$(_XHarnessArgs) " --timeout=$(WasmXHarnessTestsTimeout )" </_XHarnessArgs >
113
113
<_XHarnessArgs Condition =" '$(WasmXHarnessArgsCli)' != ''" >$(_XHarnessArgs) $(WasmXHarnessArgsCli)</_XHarnessArgs >
114
114
115
115
<!-- There two flavors of WasmXHarnessArgs and WasmXHarnessMonoArgs, one is MSBuild property and the other is environment variable -->
Original file line number Diff line number Diff line change 40
40
<_XHarnessArgs Condition =" '$(WasmSingleFileBundle)' != 'true'" >$(_XHarnessArgs) --engine-arg=--dir=.</_XHarnessArgs >
41
41
<_XHarnessArgs Condition =" '$(IsFunctionalTest)' == 'true'" >$(_XHarnessArgs) --expected-exit-code=$(ExpectedExitCode)</_XHarnessArgs >
42
42
<_XHarnessArgs Condition =" '$(WasmXHarnessArgs)' != ''" >$(_XHarnessArgs) $(WasmXHarnessArgs)</_XHarnessArgs >
43
- <_XHarnessArgs Condition =" '$(_XHarnessTestsTimeout )' != '' " >$(_XHarnessArgs) " --timeout=$(_XHarnessTestsTimeout )" </_XHarnessArgs >
43
+ <_XHarnessArgs Condition =" '$(WasmXHarnessTestsTimeout )' != ''" >$(_XHarnessArgs) " --timeout=$(WasmXHarnessTestsTimeout )" </_XHarnessArgs >
44
44
<_XHarnessArgs Condition =" '$(WasmXHarnessArgsCli)' != ''" >$(_XHarnessArgs) $(WasmXHarnessArgsCli)</_XHarnessArgs >
45
45
46
46
<_InvariantGlobalization Condition =" '$(InvariantGlobalization)' == 'true'" >--env=DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true</_InvariantGlobalization >
Original file line number Diff line number Diff line change 16
16
<_ShellCommandSeparator Condition =" '$(OS)' == 'Windows_NT'" >&& </_ShellCommandSeparator >
17
17
<_ShellCommandSeparator Condition =" '$(OS)' != 'Windows_NT'" >&& </_ShellCommandSeparator >
18
18
<XUnitUseRandomizedTestOrderer Condition =" '$(XUnitUseRandomizedTestOrderer)' == '' and '$(IsTestProject)' == 'true'" >true</XUnitUseRandomizedTestOrderer >
19
- <_XHarnessTestsTimeout >00:30:00</_XHarnessTestsTimeout >
19
+ <WasmXHarnessTestsTimeout Condition = " '$(WasmXHarnessTestsTimeout)' == '' " >00:30:00</WasmXHarnessTestsTimeout >
20
20
<RunWorkingDirectory >$(BundleDir)</RunWorkingDirectory >
21
21
</PropertyGroup >
22
22
Original file line number Diff line number Diff line change 15
15
<DebuggerSupport Condition =" '$(DebuggerSupport)' == '' and '$(TargetOS)' == 'browser'" >true</DebuggerSupport >
16
16
<!-- Needed for JsonSerializerOptionsUpdateHandler tests -->
17
17
<MetadataUpdaterSupport Condition =" '$(MetadataUpdaterSupport)' == '' and '$(TargetOS)' == 'browser'" >true</MetadataUpdaterSupport >
18
- <WasmXHarnessArgs >$(WasmXHarnessArgs) --timeout=1800</ WasmXHarnessArgs >
18
+ <WasmXHarnessTestsTimeout >00:45:00</ WasmXHarnessTestsTimeout >
19
19
<IncludeRemoteExecutor >true</IncludeRemoteExecutor >
20
20
</PropertyGroup >
21
21
<ItemGroup Condition =" '$(ContinuousIntegrationBuild)' == 'true'" >
You can’t perform that action at this time.
0 commit comments