fix test

dotnet · Jul 10, 2023 · fd05146 · fd05146
1 parent 3b3c42b
commit fd05146
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/src/Compilers/Core/MSBuildTaskTests/VbcTests.cs b/src/Compilers/Core/MSBuildTaskTests/VbcTests.cs
@@ -8,11 +8,19 @@
 using Microsoft.CodeAnalysis.BuildTasks.UnitTests.TestUtilities;
 using Roslyn.Test.Utilities;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace Microsoft.CodeAnalysis.BuildTasks.UnitTests
 {
     public sealed class VbcTests
     {
+        public ITestOutputHelper TestOutputHelper { get; }
+
+        public VbcTests(ITestOutputHelper testOutputHelper)
+        {
+            TestOutputHelper = testOutputHelper;
+        }
+
         [Fact]
         public void SingleSource()
         {
@@ -523,28 +531,28 @@ public void ReportIVTsSwitch()
         [Fact]
         public void CommandLineArgs1()
         {
-            var engine = new MockEngine();
-            var csc = new Csc()
+            var engine = new MockEngine(TestOutputHelper);
+            var csc = new Vbc()
             {
                 BuildEngine = engine,
                 Sources = MSBuildUtil.CreateTaskItems("test.vb"),
             };
 
-            TaskTestUtil.AssertCommandLine(csc, engine, "/out:test.exe", "test.vb");
+            TaskTestUtil.AssertCommandLine(csc, engine, "/optionstrict:custom", "/out:test.exe", "test.vb");
         }
 
         [Fact]
         public void CommandLineArgs2()
         {
-            var engine = new MockEngine();
-            var csc = new Csc()
+            var engine = new MockEngine(TestOutputHelper);
+            var csc = new Vbc()
             {
                 BuildEngine = engine,
                 Sources = MSBuildUtil.CreateTaskItems("test.vb", "blah.vb"),
                 TargetType = "library"
             };
 
-            TaskTestUtil.AssertCommandLine(csc, engine, "/out:test.dll", "/target:library", "test.vb", "blah.vb");
+            TaskTestUtil.AssertCommandLine(csc, engine, "/optionstrict:custom", "/out:test.dll", "/target:library", "test.vb", "blah.vb");
         }
     }
 }
diff --git a/src/Compilers/Shared/RuntimeHostInfo.cs b/src/Compilers/Shared/RuntimeHostInfo.cs
@@ -55,14 +55,14 @@ internal static (string processFilePath, string commandLineArguments, string too
         /// </summary>
         internal static string GetDotNetPathOrDefault()
         {
+            var (fileName, sep) = PlatformInformation.IsWindows
+                ? ("dotnet.exe", ';')
+                : ("dotnet", ':');
             if (Environment.GetEnvironmentVariable("DOTNET_ROOT") is { } rootStr)
             {
-                return rootStr;
+                return Path.Combine(rootStr, fileName);
             }
 
-            var (fileName, sep) = PlatformInformation.IsWindows
-                ? ("dotnet.exe", ';')
-                : ("dotnet", ':');
             var path = Environment.GetEnvironmentVariable("PATH") ?? "";
             foreach (var item in path.Split(sep, StringSplitOptions.RemoveEmptyEntries))
             {