Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP][wasm] Fixes for OuterLoop mono pipeline #70752

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion eng/pipelines/libraries/outerloop-mono.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
buildConfig: Release
runtimeFlavor: mono
shouldContinueOnError: true
platforms:
- windows_x86
- Browser_wasm
Expand All @@ -43,14 +44,15 @@ jobs:
testScope: outerloop
creator: dotnet-bot
testRunNamePrefixSuffix: Mono_$(_BuildConfig)

- ${{ if eq(variables['isRollingBuild'], false) }}:
- 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: Debug
runtimeFlavor: mono
shouldContinueOnError: true
platforms:
- windows_x64
- Linux_x64
Expand Down
1 change: 1 addition & 0 deletions eng/testing/ProvisioningVersions.props
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<ChromiumDirName>chrome-linux</ChromiumDirName>
<ChromeDriverDirName>chromedriver_linux64</ChromeDriverDirName>
<ChromiumBinaryName>chrome</ChromiumBinaryName>
<ChromeDriverBinaryName>chromedriver</ChromeDriverBinaryName>
<FirefoxRevision>97.0.1</FirefoxRevision>
<FirefoxUrl>https://ftp.mozilla.org/pub/firefox/releases/$(FirefoxRevision)/linux-x86_64/en-US/firefox-$(FirefoxRevision).tar.bz2</FirefoxUrl>
<FirefoxBinaryName>firefox</FirefoxBinaryName>
Expand Down
33 changes: 33 additions & 0 deletions eng/testing/provisioning.targets
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
<ChromeDir>$(ArtifactsBinDir)chrome\</ChromeDir>
<BrowserStampDir>$(ArtifactsBinDir)\</BrowserStampDir>
<ChromeStampFile>$(BrowserStampDir).install-chrome-$(ChromiumRevision).stamp</ChromeStampFile>

<ChromeDriverDir>$(ArtifactsBinDir)chromedriver\</ChromeDriverDir>
<ChromeDriverStampFile>$(BrowserStampDir).install-chromedriver-$(ChromiumRevision).stamp</ChromeDriverStampFile>

<FirefoxDir>$(ArtifactsBinDir)firefox\</FirefoxDir>
<FirefoxStampFile>$(BrowserStampDir).install-firefox-$(FirefoxRevision).stamp</FirefoxStampFile>
</PropertyGroup>
Expand Down Expand Up @@ -37,6 +41,35 @@
<Touch Files="$(ChromeStampFile)" AlwaysCreate="true" />
</Target>

<Target Name="DownloadAndInstallChromeDriver"
AfterTargets="Build"
Condition="!Exists($(ChromeDriverStampFile)) and '$(InstallChromeDriverForTests)' == 'true'">

<ItemGroup>
<_StampFile Include="$(BrowserStampDir).install-chrome*.stamp" />
</ItemGroup>

<Delete Files="@(_StampFile)" />
<RemoveDir Directories="$(ChromeDriverDir)" />

<DownloadFile SourceUrl="$(ChromeDriverUrl)" DestinationFolder="$(ChromeDriverDir)" SkipUnchangedFiles="true">
<Output TaskParameter="DownloadedFile" PropertyName="_DownloadedFile" />
</DownloadFile>
<Unzip SourceFiles="$(_DownloadedFile)" DestinationFolder="$(ChromeDriverDir)" />

<PropertyGroup>
<_ChromeDriverBinaryPath>$([MSBuild]::NormalizePath($(ChromeDriverDir), $(ChromeDriverDirName), $(ChromeDriverBinaryName)))</_ChromeDriverBinaryPath>
</PropertyGroup>

<Error Text="Cannot find chrome at $(_ChromeDriverBinaryPath) in the downloaded copy"
Condition="!Exists($(_ChromeDriverBinaryPath))" />

<Exec Command="chmod +x $(_ChromeDriverBinaryPath)" Condition="!$([MSBuild]::IsOSPlatform('windows'))" />

<Touch Files="$(ChromeDriverStampFile)" AlwaysCreate="true" />
</Target>


<Target Name="DownloadAndInstallFirefox"
AfterTargets="Build"
Condition="!Exists($(FirefoxStampFile)) and '$(InstallFirefoxForTests)' == 'true' and !$([MSBuild]::IsOSPlatform('windows'))">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1728,7 +1728,7 @@ from writeSize in new[] { 10 * 1024 * 1024 }
select new object[] { mode, writeSize, startWithFlush };

[OuterLoop]
[Theory]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))]
[MemberData(nameof(ReadWrite_Success_Large_MemberData))]
public virtual async Task ReadWrite_Success_Large(ReadWriteMode mode, int writeSize, bool startWithFlush) =>
await ReadWrite_Success(mode, writeSize, startWithFlush);
Expand Down Expand Up @@ -2427,7 +2427,7 @@ public static IEnumerable<object[]> CopyToAsync_AllDataCopied_MemberData() =>
select new object[] { byteCount, useAsync };

[OuterLoop]
[Theory]
[ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))]
[InlineData(false)]
[InlineData(true)]
public virtual async Task CopyToAsync_AllDataCopied_Large(bool useAsync) =>
Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.Console/tests/WindowAndCursorProps.cs
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,7 @@ public static void Beep_Invoke_Success()
[Fact]
[OuterLoop] // makes noise, not very inner-loop friendly
[PlatformSpecific(TestPlatforms.Windows)]
[SkipOnPlatform(TestPlatforms.Browser, "Console.Beep is not supported on browser")]
public static void BeepWithFrequency_Invoke_Success()
{
// Nothing to verify; just run the code.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ public static void Zip_NotPipelined_Longrunning(Labeled<ParallelQuery<int>> left

// Zip with ordering on showed issues, but it was due to the ordering component.
// This is included as a regression test for that particular repro.
[Theory]
[ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))]
[OuterLoop]
[MemberData(nameof(ZipThreadedData), new[] { 1, 2, 16, 128, 1024 }, new[] { 1, 2, 4, 7, 8, 31, 32 })]
public static void Zip_AsOrdered_ThreadedDeadlock(Labeled<ParallelQuery<int>> left, int leftCount, Labeled<ParallelQuery<int>> right, int rightCount, int degree)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<TestUsingWorkloads Condition="'$(TestUsingWorkloads)' == ''">true</TestUsingWorkloads>
<InstallWorkloadForTesting>true</InstallWorkloadForTesting>
<InstallChromeForTests Condition="'$(InstallChromeForTests)' == '' and '$(ContinuousIntegrationBuild)' != 'true' and Exists('/.dockerenv')">true</InstallChromeForTests>
<InstallChromeDriverForTests Condition="'$(InstallChromeDriverForTests)' == '' and '$(ContinuousIntegrationBuild)' != 'true' and Exists('/.dockerenv')">true</InstallChromeDriverForTests>

<!-- don't run any wasm build steps -->
<IsWasmProject>false</IsWasmProject>
Expand Down