ToolsetConfigurationReaderTests: Remove the use of XPLAT define

... constant that is unnecessary now. "it was just there to wall off the platform-detection methods that don't exist in master yet." - Rainer
tmeschter · Jul 7, 2016 · e190a6f · e190a6f
1 parent de17317
commit e190a6f
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/XMakeBuildEngine/UnitTests/Definition/ToolsetConfigurationReader_Tests.cs b/src/XMakeBuildEngine/UnitTests/Definition/ToolsetConfigurationReader_Tests.cs
@@ -571,24 +571,20 @@ public void ExtensionPathsTest_Basic1()
             string defaultToolsVersion = reader.ReadToolsets(toolsets, new PropertyDictionary<ProjectPropertyInstance>(), new PropertyDictionary<ProjectPropertyInstance>(), true, out msbuildOverrideTasksPath, out defaultOverrideToolsVersion);
 
             Dictionary<string, List<string>> pathsTable = toolsets["2.0"].ImportPropertySearchPathsTable;
-#if XPLAT
             if (NativeMethodsShared.IsWindows)
-#endif
             {
                 CheckPathsTable(pathsTable, "MSBuildExtensionsPath", new string[] {"c:\\foo"});
                 CheckPathsTable(pathsTable, "MSBuildExtensionsPath64", new string[] {"c:\\foo64", "c:\\bar64"});
             }
-#if XPLAT
             else if (NativeMethodsShared.IsOSX)
             {
-                CheckPathsTable(pathsTable, ProjectImportPathMatch.Default, new string[] {"/tmp/foo"});
-                CheckPathsTable(pathsTable, ProjectImportPathMatch.Path32, new string[] {"/tmp/foo32", "/tmp/bar32"});
+                CheckPathsTable(pathsTable, "MSBuildExtensionsPath", new string[] {"/tmp/foo"});
+                CheckPathsTable(pathsTable, "MSBuildExtensionsPath32", new string[] {"/tmp/foo32", "/tmp/bar32"});
             }
             else
             {
-                CheckPathsTable(pathsTable, ProjectImportPathMatch.Default, new string[] {"/tmp/bar"});
+                CheckPathsTable(pathsTable, "MSBuildExtensionsPath", new string[] {"/tmp/bar"});
             }
-#endif
         }
 
         private void CheckPathsTable(Dictionary<string, List<string>> pathsTable, string kind, string[] expectedPaths)