Skip to content

Commit

Permalink
Workaround for Sqlite/InMemory test failures on OSX (#28328)
Browse files Browse the repository at this point in the history
  • Loading branch information
smitpatel committed Jun 29, 2022
1 parent f4aa232 commit 50300fb
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
2 changes: 2 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ stages:
- script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine $(_InternalRuntimeDownloadArgs)
env:
Test__Cosmos__DefaultConnection: $(_CosmosConnectionUrl)
COMPlus_EnableWriteXorExecute: 0 # Work-around for https://github.com/dotnet/runtime/issues/70758
name: Build
- task: PublishBuildArtifacts@1
displayName: Upload TestResults
Expand Down Expand Up @@ -238,6 +239,7 @@ stages:
HelixAccessToken: $(_HelixAccessToken)
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
MSSQL_SA_PASSWORD: "Password12!"
COMPlus_EnableWriteXorExecute: 0 # Work-around for https://github.com/dotnet/runtime/issues/70758

- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- template: eng\common\templates\post-build\post-build.yml
Expand Down
7 changes: 7 additions & 0 deletions eng/helix.proj
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,13 @@
</XUnitProject>
</ItemGroup>

<!-- Work-around for https://github.com/dotnet/runtime/issues/70758 -->
<ItemGroup Condition = "'$(HelixTargetQueue.StartsWith(`OSX`))'">
<XUnitProject Update="$(RepoRoot)/test/EFCore.InMemory.FunctionalTests/*.csproj;$(RepoRoot)/test/EFCore.Sqlite.FunctionalTests/*.csproj">
<PreCommands>$(PreCommands); export COMPlus_EnableWriteXorExecute=0</PreCommands>
</XUnitProject>
</ItemGroup>

<!-- Start SqlServer instance for test projects which uses SqlServer on docker. Also remove other projects as they will be run outside of docker. -->
<ItemGroup Condition = "'$(HelixTargetQueue.Contains(`ubuntu-18.04-helix-sqlserver-amd64`))'">
<XUnitProject Remove="$(RepoRoot)/test/**/*.csproj"/>
Expand Down

0 comments on commit 50300fb

Please sign in to comment.