Make merged test wrappers single file friendly (#86428)

Assembly.Location returns an empty string in single file.
dotnet · May 21, 2023 · 8f04ae1 · 8f04ae1
1 parent 72fb58b
commit 8f04ae1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/tests/Common/CoreCLRTestLibrary/OutOfProcessTest.cs b/src/tests/Common/CoreCLRTestLibrary/OutOfProcessTest.cs
@@ -25,7 +25,7 @@ public static class OutOfProcessTest
         static OutOfProcessTest()
         {
             reportBase = Directory.GetCurrentDirectory();
-            testBinaryBase = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!;
+            testBinaryBase = AppContext.BaseDirectory;
             helixUploadRoot = Environment.GetEnvironmentVariable("HELIX_WORKITEM_UPLOAD_ROOT");
             if (!String.IsNullOrEmpty(helixUploadRoot))
             {
@@ -49,10 +49,10 @@ static OutOfProcessTest()
             && !OperatingSystem.IsBrowser()
             && !OperatingSystem.IsOSPlatform("Wasi");
 
-        public static void RunOutOfProcessTest(string basePath, string assemblyPath)
+        public static void RunOutOfProcessTest(string assemblyPath)
         {
             int ret = -100;
-            string baseDir = Path.GetDirectoryName(basePath);
+            string baseDir = AppContext.BaseDirectory;
             string outputDir = System.IO.Path.GetFullPath(Path.Combine(reportBase, Path.GetDirectoryName(assemblyPath)));
             string outputFile = Path.Combine(outputDir, "output.txt");
             string errorFile = Path.Combine(outputDir, "error.txt");

diff --git a/src/tests/Common/XUnitWrapperGenerator/ITestInfo.cs b/src/tests/Common/XUnitWrapperGenerator/ITestInfo.cs
@@ -309,7 +309,7 @@ public OutOfProcessTest(string displayName, string relativeAssemblyPath)
         ExecutionStatement.AppendLine("if (TestLibrary.OutOfProcessTest.OutOfProcessTestsSupported)");
         using (ExecutionStatement.NewBracesScope())
         {
-            ExecutionStatement.AppendLine($@"TestLibrary.OutOfProcessTest.RunOutOfProcessTest(typeof(Program).Assembly.Location, @""{relativeAssemblyPath}"");");
+            ExecutionStatement.AppendLine($@"TestLibrary.OutOfProcessTest.RunOutOfProcessTest(@""{relativeAssemblyPath}"");");
         }
     }