Refactor source build tests to used common extracted sdk (#44568)

dotnet · Nov 1, 2024 · be243d5 · be243d5
1 parent 3ec0aba
commit be243d5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/DotNetHelper.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/DotNetHelper.cs
@@ -31,16 +31,6 @@ public DotNetHelper(ITestOutputHelper outputHelper)
 
         lock (s_lockObj)
         {
-            if (!Directory.Exists(Config.DotNetDirectory))
-            {
-                if (!File.Exists(Config.SdkTarballPath))
-                {
-                    throw new InvalidOperationException($"Tarball path '{Config.SdkTarballPath}' specified in {Config.SdkTarballPath} does not exist.");
-                }
-
-                Directory.CreateDirectory(Config.DotNetDirectory);
-                Utilities.ExtractTarball(Config.SdkTarballPath, Config.DotNetDirectory, outputHelper);
-            }
             IsMonoRuntime = DetermineIsMonoRuntime(Config.DotNetDirectory);
 
             if (!Directory.Exists(ProjectsDirectory))

diff --git a/...content/test/Microsoft.DotNet.SourceBuild.Tests/Microsoft.DotNet.SourceBuild.Tests.csproj b/...content/test/Microsoft.DotNet.SourceBuild.Tests/Microsoft.DotNet.SourceBuild.Tests.csproj
@@ -52,7 +52,7 @@
         <Value>$(ArtifactsTestResultsDir)</Value>
       </RuntimeHostConfigurationOption>
       <RuntimeHostConfigurationOption Include="$(MSBuildProjectName).DotNetDirectory">
-        <Value>$(TargetDir)extracted-sdk</Value>
+        <Value>$(DotNetSdkExtractDir)</Value>
       </RuntimeHostConfigurationOption>
       <RuntimeHostConfigurationOption Include="$(MSBuildProjectName).TargetRid">
         <Value>$(TargetRid)</Value>

diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/SourceBuiltArtifactsTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/SourceBuiltArtifactsTests.cs
@@ -17,7 +17,7 @@ namespace Microsoft.DotNet.SourceBuild.Tests;
 public class SourceBuiltArtifactsTests : SdkTests
 {
     public static bool IncludeSourceBuiltArtifactsTests => !string.IsNullOrWhiteSpace(Config.SourceBuiltArtifactsPath);
-    
+
     public SourceBuiltArtifactsTests(ITestOutputHelper outputHelper) : base(outputHelper) { }
 
     [ConditionalFact(typeof(SourceBuiltArtifactsTests), nameof(IncludeSourceBuiltArtifactsTests))]
@@ -55,9 +55,8 @@ public void VerifyVersionFile()
 
             string sdkVersion = versionLines[1];
 
-            // Find the expected SDK version by getting it from the SDK tarball
-            Utilities.ExtractTarball(Config.SdkTarballPath ?? string.Empty, outputDir, "./sdk/*/.version");
-            DirectoryInfo sdkDir = new DirectoryInfo(Path.Combine(outputDir, "sdk"));
+            // Find the expected SDK version by getting it from the source built SDK
+            DirectoryInfo sdkDir = new DirectoryInfo(Path.Combine(Config.DotNetDirectory, "sdk"));
             string sdkVersionPath = sdkDir.GetFiles(".version", SearchOption.AllDirectories).Single().FullName;
             string[] sdkVersionLines = File.ReadAllLines(Path.Combine(outputDir, sdkVersionPath));
             string expectedSdkVersion = sdkVersionLines[3];  // Get the unique, non-stable, SDK version