Format tests should be skipped on Alpine (#17268)

This commit is contained in:
Nikola Milosavljevic 2023-08-28 10:20:35 -07:00 committed by GitHub
parent 4e1908820d
commit 6bbadb9daf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 18 deletions

View file

@ -40,9 +40,6 @@ parameters:
- name: excludeOmniSharpTests - name: excludeOmniSharpTests
type: boolean type: boolean
- name: excludeDotnetFormatTests
type: boolean
- name: enablePoison - name: enablePoison
type: boolean type: boolean
@ -221,7 +218,7 @@ jobs:
set -x set -x
dockerVolumeArgs="-v $(sourcesPath):/vmr" dockerVolumeArgs="-v $(sourcesPath):/vmr"
dockerEnvArgs="-e SMOKE_TESTS_EXCLUDE_OMNISHARP=${{ parameters.excludeOmniSharpTests }} -e SMOKE_TESTS_EXCLUDE_DOTNETFORMAT=${{ parameters.excludeDotnetFormatTests }} -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true -e SMOKE_TESTS_RUNNING_IN_CI=true" dockerEnvArgs="-e SMOKE_TESTS_EXCLUDE_OMNISHARP=${{ parameters.excludeOmniSharpTests }} -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true -e SMOKE_TESTS_RUNNING_IN_CI=true"
poisonArg='' poisonArg=''
if [[ '${{ parameters.enablePoison }}' == 'True' ]]; then if [[ '${{ parameters.enablePoison }}' == 'True' ]]; then

View file

@ -83,7 +83,6 @@ stages:
buildFromArchive: false # 🚫 buildFromArchive: false # 🚫
enablePoison: false # 🚫 enablePoison: false # 🚫
excludeOmniSharpTests: true # ✅ excludeOmniSharpTests: true # ✅
excludeDotnetFormatTests: false # 🚫
runOnline: true # ✅ runOnline: true # ✅
useMonoRuntime: false # 🚫 useMonoRuntime: false # 🚫
withPreviousSDK: false # 🚫 withPreviousSDK: false # 🚫
@ -102,7 +101,6 @@ stages:
buildFromArchive: true # ✅ buildFromArchive: true # ✅
enablePoison: false # 🚫 enablePoison: false # 🚫
excludeOmniSharpTests: true # ✅ excludeOmniSharpTests: true # ✅
excludeDotnetFormatTests: false # 🚫
runOnline: false # 🚫 runOnline: false # 🚫
useMonoRuntime: false # 🚫 useMonoRuntime: false # 🚫
withPreviousSDK: false # 🚫 withPreviousSDK: false # 🚫
@ -125,7 +123,6 @@ stages:
buildFromArchive: false # ✅ buildFromArchive: false # ✅
enablePoison: false # 🚫 enablePoison: false # 🚫
excludeOmniSharpTests: true # ✅ excludeOmniSharpTests: true # ✅
excludeDotnetFormatTests: true # ✅ - https://github.com/dotnet/format/issues/1945
runOnline: false # 🚫 runOnline: false # 🚫
useMonoRuntime: false # 🚫 useMonoRuntime: false # 🚫
withPreviousSDK: false # 🚫 withPreviousSDK: false # 🚫
@ -144,7 +141,6 @@ stages:
buildFromArchive: false # 🚫 buildFromArchive: false # 🚫
enablePoison: false # 🚫 enablePoison: false # 🚫
excludeOmniSharpTests: true # ✅ excludeOmniSharpTests: true # ✅
excludeDotnetFormatTests: false # 🚫
runOnline: true # ✅ runOnline: true # ✅
useMonoRuntime: false # 🚫 useMonoRuntime: false # 🚫
withPreviousSDK: true # ✅ withPreviousSDK: true # ✅
@ -163,7 +159,6 @@ stages:
buildFromArchive: false # 🚫 buildFromArchive: false # 🚫
enablePoison: false # 🚫 enablePoison: false # 🚫
excludeOmniSharpTests: true # ✅ excludeOmniSharpTests: true # ✅
excludeDotnetFormatTests: false # 🚫
runOnline: false # 🚫 runOnline: false # 🚫
useMonoRuntime: false # 🚫 useMonoRuntime: false # 🚫
withPreviousSDK: true # ✅ withPreviousSDK: true # ✅
@ -182,7 +177,6 @@ stages:
buildFromArchive: true # ✅ buildFromArchive: true # ✅
enablePoison: false # 🚫 enablePoison: false # 🚫
excludeOmniSharpTests: true # ✅ excludeOmniSharpTests: true # ✅
excludeDotnetFormatTests: false # 🚫
runOnline: false # 🚫 runOnline: false # 🚫
useMonoRuntime: true # ✅ useMonoRuntime: true # ✅
withPreviousSDK: false # 🚫 withPreviousSDK: false # 🚫
@ -201,7 +195,6 @@ stages:
buildFromArchive: true # ✅ buildFromArchive: true # ✅
enablePoison: false # 🚫 enablePoison: false # 🚫
excludeOmniSharpTests: false # 🚫 excludeOmniSharpTests: false # 🚫
excludeDotnetFormatTests: false # 🚫
runOnline: false # 🚫 runOnline: false # 🚫
useMonoRuntime: false # 🚫 useMonoRuntime: false # 🚫
withPreviousSDK: false # 🚫 withPreviousSDK: false # 🚫
@ -220,7 +213,6 @@ stages:
buildFromArchive: true # ✅ buildFromArchive: true # ✅
enablePoison: true # ✅ enablePoison: true # ✅
excludeOmniSharpTests: false # 🚫 excludeOmniSharpTests: false # 🚫
excludeDotnetFormatTests: false # 🚫
runOnline: false # 🚫 runOnline: false # 🚫
useMonoRuntime: false # 🚫 useMonoRuntime: false # 🚫
withPreviousSDK: false # 🚫 withPreviousSDK: false # 🚫
@ -239,7 +231,6 @@ stages:
buildFromArchive: false # 🚫 buildFromArchive: false # 🚫
enablePoison: false # 🚫 enablePoison: false # 🚫
excludeOmniSharpTests: false # 🚫 excludeOmniSharpTests: false # 🚫
excludeDotnetFormatTests: false # 🚫
runOnline: false # 🚫 runOnline: false # 🚫
useMonoRuntime: false # 🚫 useMonoRuntime: false # 🚫
withPreviousSDK: false # 🚫 withPreviousSDK: false # 🚫
@ -258,7 +249,6 @@ stages:
buildFromArchive: false # 🚫 buildFromArchive: false # 🚫
enablePoison: false # 🚫 enablePoison: false # 🚫
excludeOmniSharpTests: false # 🚫 excludeOmniSharpTests: false # 🚫
excludeDotnetFormatTests: false # 🚫
runOnline: false # 🚫 runOnline: false # 🚫
useMonoRuntime: false # 🚫 useMonoRuntime: false # 🚫
withPreviousSDK: false # 🚫 withPreviousSDK: false # 🚫
@ -279,7 +269,6 @@ stages:
buildFromArchive: false # 🚫 buildFromArchive: false # 🚫
enablePoison: false # 🚫 enablePoison: false # 🚫
excludeOmniSharpTests: true # ✅ excludeOmniSharpTests: true # ✅
excludeDotnetFormatTests: false # 🚫
runOnline: false # 🚫 runOnline: false # 🚫
useMonoRuntime: false # 🚫 useMonoRuntime: false # 🚫
withPreviousSDK: false # 🚫 withPreviousSDK: false # 🚫
@ -299,7 +288,6 @@ stages:
buildFromArchive: false # 🚫 buildFromArchive: false # 🚫
enablePoison: false # 🚫 enablePoison: false # 🚫
excludeOmniSharpTests: false # 🚫 excludeOmniSharpTests: false # 🚫
excludeDotnetFormatTests: false # 🚫
runOnline: false # 🚫 runOnline: false # 🚫
useMonoRuntime: false # 🚫 useMonoRuntime: false # 🚫
withPreviousSDK: false # 🚫 withPreviousSDK: false # 🚫

View file

@ -10,7 +10,6 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests;
internal static class Config internal static class Config
{ {
public const string DotNetDirectoryEnv = "SMOKE_TESTS_DOTNET_DIR"; public const string DotNetDirectoryEnv = "SMOKE_TESTS_DOTNET_DIR";
public const string ExcludeDotnetFormatEnv = "SMOKE_TESTS_EXCLUDE_DOTNETFORMAT";
public const string ExcludeOmniSharpEnv = "SMOKE_TESTS_EXCLUDE_OMNISHARP"; public const string ExcludeOmniSharpEnv = "SMOKE_TESTS_EXCLUDE_OMNISHARP";
public const string MsftSdkTarballPathEnv = "SMOKE_TESTS_MSFT_SDK_TARBALL_PATH"; public const string MsftSdkTarballPathEnv = "SMOKE_TESTS_MSFT_SDK_TARBALL_PATH";
public const string PoisonReportPathEnv = "SMOKE_TESTS_POISON_REPORT_PATH"; public const string PoisonReportPathEnv = "SMOKE_TESTS_POISON_REPORT_PATH";

View file

@ -19,9 +19,15 @@ public class DotNetFormatTests : SmokeTests
/// <Summary> /// <Summary>
/// Format an unformatted project and verify that the output matches the pre-computed solution. /// Format an unformatted project and verify that the output matches the pre-computed solution.
/// </Summary> /// </Summary>
[SkippableFact(Config.ExcludeDotnetFormatEnv, skipOnTrueEnv: true)] [Fact]
public void FormatProject() public void FormatProject()
{ {
if (Config.TargetRid.Contains("alpine"))
{
// Skipping this test on Alpine due to https://github.com/dotnet/format/issues/1945
return;
}
string unformattedCsFilePath = Path.Combine(BaselineHelper.GetAssetsDirectory(), UnformattedFileName); string unformattedCsFilePath = Path.Combine(BaselineHelper.GetAssetsDirectory(), UnformattedFileName);
string projectDirectory = DotNetHelper.ExecuteNew("console", nameof(FormatProject), "C#"); string projectDirectory = DotNetHelper.ExecuteNew("console", nameof(FormatProject), "C#");