wipaj/fix-outerloop

7 files changed, 42 insertions, 4 deletions

diff --git a/eng/pipelines/libraries/outerloop-mono.yml b/eng/pipelines/libraries/outerloop-mono.yml
index a97e4ccc1f7..e677a75d115 100644
--- a/eng/pipelines/libraries/outerloop-mono.yml
+++ b/eng/pipelines/libraries/outerloop-mono.yml
@@ -20,6 +20,7 @@ jobs:
       helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
       buildConfig: Release
       runtimeFlavor: mono
+      shouldContinueOnError: true
       platforms:
       - windows_x86
       - Browser_wasm
@@ -43,7 +44,7 @@ jobs:
           testScope: outerloop
           creator: dotnet-bot
           testRunNamePrefixSuffix: Mono_$(_BuildConfig)
-    
+
   - ${{ if eq(variables['isRollingBuild'], false) }}:
     - template: /eng/pipelines/common/platform-matrix.yml
       parameters:
@@ -51,6 +52,7 @@ jobs:
         helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
         buildConfig: Debug
         runtimeFlavor: mono
+        shouldContinueOnError: true
         platforms:
         - windows_x64
         - Linux_x64
diff --git a/eng/testing/ProvisioningVersions.props b/eng/testing/ProvisioningVersions.props
index 63fc5a13c7e..07f6d41a697 100644
--- a/eng/testing/ProvisioningVersions.props
+++ b/eng/testing/ProvisioningVersions.props
@@ -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>
diff --git a/eng/testing/provisioning.targets b/eng/testing/provisioning.targets
index 38293a91670..8b484a0a2ca 100644
--- a/eng/testing/provisioning.targets
+++ b/eng/testing/provisioning.targets
@@ -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>
@@ -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'))">
diff --git a/src/libraries/Common/tests/StreamConformanceTests/System/IO/StreamConformanceTests.cs b/src/libraries/Common/tests/StreamConformanceTests/System/IO/StreamConformanceTests.cs
index 1086ffeed62..4405654d3ab 100644
--- a/src/libraries/Common/tests/StreamConformanceTests/System/IO/StreamConformanceTests.cs
+++ b/src/libraries/Common/tests/StreamConformanceTests/System/IO/StreamConformanceTests.cs
@@ -1728,7 +1728,7 @@ namespace System.IO.Tests
             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);
@@ -2427,7 +2427,7 @@ namespace System.IO.Tests
             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) =>
diff --git a/src/libraries/System.Console/tests/WindowAndCursorProps.cs b/src/libraries/System.Console/tests/WindowAndCursorProps.cs
index f5ddc739def..103ff1f2283 100644
--- a/src/libraries/System.Console/tests/WindowAndCursorProps.cs
+++ b/src/libraries/System.Console/tests/WindowAndCursorProps.cs
@@ -287,6 +287,7 @@ public class WindowAndCursorProps
     [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.
diff --git a/src/libraries/System.Linq.Parallel/tests/QueryOperators/ZipTests.cs b/src/libraries/System.Linq.Parallel/tests/QueryOperators/ZipTests.cs
index c952169b8c3..b40c467ee85 100644
--- a/src/libraries/System.Linq.Parallel/tests/QueryOperators/ZipTests.cs
+++ b/src/libraries/System.Linq.Parallel/tests/QueryOperators/ZipTests.cs
@@ -178,7 +178,7 @@ namespace System.Linq.Parallel.Tests
 
         // 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)
diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/Wasm.Build.Tests.csproj b/src/tests/BuildWasmApps/Wasm.Build.Tests/Wasm.Build.Tests.csproj
index f9874e4d95c..40d899f013c 100644
--- a/src/tests/BuildWasmApps/Wasm.Build.Tests/Wasm.Build.Tests.csproj
+++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/Wasm.Build.Tests.csproj
@@ -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>