Skip to content

Commit 50300fb

Browse files
authored
Workaround for Sqlite/InMemory test failures on OSX (#28328)
1 parent f4aa232 commit 50300fb

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

azure-pipelines.yml

+2
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ stages:
132132
- script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine $(_InternalRuntimeDownloadArgs)
133133
env:
134134
Test__Cosmos__DefaultConnection: $(_CosmosConnectionUrl)
135+
COMPlus_EnableWriteXorExecute: 0 # Work-around for https://github.com/dotnet/runtime/issues/70758
135136
name: Build
136137
- task: PublishBuildArtifacts@1
137138
displayName: Upload TestResults
@@ -238,6 +239,7 @@ stages:
238239
HelixAccessToken: $(_HelixAccessToken)
239240
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
240241
MSSQL_SA_PASSWORD: "Password12!"
242+
COMPlus_EnableWriteXorExecute: 0 # Work-around for https://github.com/dotnet/runtime/issues/70758
241243

242244
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
243245
- template: eng\common\templates\post-build\post-build.yml

eng/helix.proj

+7
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,13 @@
3737
</XUnitProject>
3838
</ItemGroup>
3939

40+
<!-- Work-around for https://github.com/dotnet/runtime/issues/70758 -->
41+
<ItemGroup Condition = "'$(HelixTargetQueue.StartsWith(`OSX`))'">
42+
<XUnitProject Update="$(RepoRoot)/test/EFCore.InMemory.FunctionalTests/*.csproj;$(RepoRoot)/test/EFCore.Sqlite.FunctionalTests/*.csproj">
43+
<PreCommands>$(PreCommands); export COMPlus_EnableWriteXorExecute=0</PreCommands>
44+
</XUnitProject>
45+
</ItemGroup>
46+
4047
<!-- Start SqlServer instance for test projects which uses SqlServer on docker. Also remove other projects as they will be run outside of docker. -->
4148
<ItemGroup Condition = "'$(HelixTargetQueue.Contains(`ubuntu-18.04-helix-sqlserver-amd64`))'">
4249
<XUnitProject Remove="$(RepoRoot)/test/**/*.csproj"/>

0 commit comments

Comments
 (0)