|
34 | 34 | <_workItemTimeout Condition="'$(Scenario)' == '' and '$(_workItemTimeout)' == '' and '$(Outerloop)' == 'true'">00:20:00</_workItemTimeout>
|
35 | 35 | <_workItemTimeout Condition="'$(Scenario)' == '' and '$(_workItemTimeout)' == ''">00:15:00</_workItemTimeout>
|
36 | 36 | <_workItemTimeout Condition="'$(Scenario)' != '' and '$(_workItemTimeout)' == ''">00:30:00</_workItemTimeout>
|
| 37 | + <_workItemTimeout Condition="'$(Scenario)' == 'wasmtestonbrowser' and '$(BrowserHost)' == 'windows'">00:45:00</_workItemTimeout> |
37 | 38 |
|
38 | 39 | <!-- The Helix runtime payload and the tests to run -->
|
39 | 40 | <!-- TestArchiveRuntimeFile will be passed as a property by the calling project -->
|
|
110 | 111 | <HelixPreCommand Include="export PATH=$HELIX_CORRELATION_PAYLOAD/chromedriver_linux64:$PATH" />
|
111 | 112 | <HelixPreCommand Include="export PATH=$HELIX_CORRELATION_PAYLOAD/chrome-linux:$PATH" />
|
112 | 113 | </ItemGroup>
|
| 114 | + <ItemGroup Condition="'$(NeedsToRunOnBrowser)' == 'true' and '$(WindowsShell)' == 'true'"> |
| 115 | + <HelixPreCommand Include="set PATH=%HELIX_CORRELATION_PAYLOAD%\chromedriver_win32%3B%PATH%" /> |
| 116 | + <HelixPreCommand Include="set PATH=%HELIX_CORRELATION_PAYLOAD%\chrome-win%3B%PATH%" /> |
| 117 | + </ItemGroup> |
113 | 118 |
|
114 | 119 | <Choose>
|
115 | 120 | <When Condition="'$(NeedsWorkload)' == 'true'">
|
|
308 | 313 | </ItemGroup>
|
309 | 314 |
|
310 | 315 | <PropertyGroup Condition="'$(TargetOS)' == 'Browser'">
|
311 |
| - <!-- Version number to revision number mapping from http://omahaproxy.appspot.com/ --> |
312 |
| - <!-- 84.0.4147.105 is 768962 for example --> |
313 |
| - <ChromiumRevision>768968</ChromiumRevision> |
314 |
| - <ChromiumUrl>https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/$(ChromiumRevision)/chrome-linux.zip</ChromiumUrl> |
315 |
| - <ChromeDriverUrl>https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/$(ChromiumRevision)/chromedriver_linux64.zip</ChromeDriverUrl> |
316 | 316 | <EmSdkDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'mono', 'wasm', 'emsdk'))</EmSdkDir>
|
317 | 317 | <WasmBuildTargetsDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'mono', 'wasm', 'build'))</WasmBuildTargetsDir>
|
318 | 318 | <TestEchoMiddleware>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin', 'NetCoreServer', '$(NetCoreAppCurrent)-$(Configuration)'))</TestEchoMiddleware>
|
319 | 319 | <RemoteLoopMiddleware>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin', 'RemoteLoopServer', '$(NetCoreAppCurrent)-$(Configuration)'))</RemoteLoopMiddleware>
|
320 | 320 | <WorkItemPrefix Condition="'$(Scenario)' == 'BuildWasmApps' and '$(TestUsingWorkloads)' == 'true'">Workloads-</WorkItemPrefix>
|
321 | 321 | <WorkItemPrefix Condition="'$(Scenario)' == 'BuildWasmApps' and '$(TestUsingWorkloads)' != 'true'">EMSDK-</WorkItemPrefix>
|
322 | 322 | </PropertyGroup>
|
| 323 | + <PropertyGroup Condition="'$(TargetOS)' == 'Browser' and '$(BrowserHost)' != 'windows'"> |
| 324 | + <!-- Version number to revision number mapping from http://omahaproxy.appspot.com/ --> |
| 325 | + <!-- 84.0.4147.105 is 768962 for example --> |
| 326 | + <ChromiumRevision>768968</ChromiumRevision> |
| 327 | + <ChromiumUrl>https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/$(ChromiumRevision)/chrome-linux.zip</ChromiumUrl> |
| 328 | + <ChromeDriverUrl>https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/$(ChromiumRevision)/chromedriver_linux64.zip</ChromeDriverUrl> |
| 329 | + </PropertyGroup> |
| 330 | + <PropertyGroup Condition="'$(TargetOS)' == 'Browser' and '$(BrowserHost)' == 'windows'"> |
| 331 | + <ChromiumRevision>768983</ChromiumRevision> |
| 332 | + <ChromiumUrl>https://storage.googleapis.com/chromium-browser-snapshots/Win_x64/$(ChromiumRevision)/chrome-win.zip</ChromiumUrl> |
| 333 | + <ChromeDriverUrl>https://storage.googleapis.com/chromium-browser-snapshots/Win_x64/$(ChromiumRevision)/chromedriver_win32.zip</ChromeDriverUrl> |
| 334 | + </PropertyGroup> |
323 | 335 |
|
324 | 336 | <PropertyGroup Condition="'$(RuntimeFlavor)' == 'Mono'">
|
325 | 337 | <_MonoAotCrossCompilerPath>$([MSBuild]::NormalizePath($(MonoAotCrossDir), 'mono-aot-cross'))</_MonoAotCrossCompilerPath>
|
|
369 | 381 | <HelixCorrelationPayload Include="$(HelixCorrelationPayload)"
|
370 | 382 | Condition="'$(IncludeHelixCorrelationPayload)' == 'true' and '$(TargetOS)' != 'Browser'"
|
371 | 383 | AsArchive="$(HelixCorrelationPayload.EndsWith('.zip'))" />
|
372 |
| - <HelixCorrelationPayload Include="chromium" Uri="$(ChromiumUrl)" Condition="'$(NeedsToRunOnBrowser)' == 'true' and '$(BrowserHost)' != 'windows'" /> |
373 |
| - <HelixCorrelationPayload Include="chromedriver" Uri="$(ChromeDriverUrl)" Condition="'$(NeedsToRunOnBrowser)' == 'true' and '$(BrowserHost)' != 'windows'" /> |
| 384 | + <HelixCorrelationPayload Include="chromium" Uri="$(ChromiumUrl)" Condition="'$(NeedsToRunOnBrowser)' == 'true'" /> |
| 385 | + <HelixCorrelationPayload Include="chromedriver" Uri="$(ChromeDriverUrl)" Condition="'$(NeedsToRunOnBrowser)' == 'true'" /> |
374 | 386 |
|
375 | 387 | <_WorkItem Include="$(WorkItemArchiveWildCard)" Exclude="$(HelixCorrelationPayload)" />
|
376 | 388 | <_WorkItem Include="$(TestArchiveRoot)runonly/**/WebAssembly.Console.*.Test.zip" Condition="'$(TargetOS)' == 'Browser' and '$(Scenario)' != 'WasmTestOnBrowser' and '$(Scenario)' != 'BuildWasmApps'" />
|
|
393 | 405 | <ExecXHarnessCmd>dotnet exec %XHARNESS_CLI_PATH%</ExecXHarnessCmd>
|
394 | 406 | <XHarnessOutput>%HELIX_WORKITEM_UPLOAD_ROOT%\xharness-output</XHarnessOutput>
|
395 | 407 | <XHarnessCommand>%XHARNESS_COMMAND%</XHarnessCommand>
|
| 408 | + <XHarnessBrowserPathArg>--browser-path=%HELIX_CORRELATION_PAYLOAD%\chrome-win\chrome.exe</XHarnessBrowserPathArg> |
396 | 409 | </PropertyGroup>
|
397 | 410 |
|
398 | 411 | <ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(Scenario)' != 'WasmTestOnBrowser' and '$(Scenario)' != 'BuildWasmApps'">
|
|
411 | 424 | <HelixWorkItem Include="@(_RunOnlyWorkItem -> '%(FileName)')" >
|
412 | 425 | <PayloadArchive>%(Identity)</PayloadArchive>
|
413 | 426 | <!-- No RunTests script generated for the sample project so we just use the direct command -->
|
414 |
| - <Command>$(ExecXHarnessCmd) wasm $(XHarnessCommand) --app=. --browser=Chrome --html-file=index.html --output-directory=$(XHarnessOutput) -- %(FileName).dll --testing</Command> |
| 427 | + <Command>$(ExecXHarnessCmd) wasm $(XHarnessCommand) --app=. --browser=Chrome $(XHarnessBrowserPathArg) --html-file=index.html --output-directory=$(XHarnessOutput) -- %(FileName).dll --testing</Command> |
415 | 428 | </HelixWorkItem>
|
416 | 429 | </ItemGroup>
|
417 | 430 |
|
|
0 commit comments