Fix IronPython.Analyzer location and tests

Author: slozier

IronPython.sln

@@ -70,7 +70,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{EE77D917
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonConsole32", "src\executables\IronPython.Console32\IronPythonConsole32.csproj", "{AD21022F-E7C1-4B74-97C1-0A0E48EFF992}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonAnalyzer", "src\roslyn\IronPython.Analyzer\IronPythonAnalyzer\IronPythonAnalyzer.csproj", "{DA3415F3-6922-42D0-93D7-BEE2E8603A18}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonAnalyzer", "src\roslyn\IronPython.Analyzer\IronPythonAnalyzer.csproj", "{DA3415F3-6922-42D0-93D7-BEE2E8603A18}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "choco", "choco", "{EA550FD8-2241-4131-8292-619D009E0199}"
 	ProjectSection(SolutionItems) = preProject

make.ps1

@@ -222,7 +222,7 @@ function Purge() {
     Get-ChildItem -Name "obj" -Directory -Path "$_BASEDIR" -Recurse | Remove-Item -Force -Recurse
 
     Write-Verbose "Deleting ""bin"" directories..."
-    foreach ($dir in @("", (Join-Path "IronPythonAnalyzer" "IronPythonAnalyzer"))) {
+    foreach ($dir in @("", (Join-Path "src" "roslyn" "IronPython.Analyzer"))) {
         if (Test-Path (Join-Path $_BASEDIR $dir "bin" -OutVariable targetPath)) {
             Remove-Item -Path $targetPath -Force -Recurse
         }

src/core/IronPython.Modules/IronPython.Modules.csproj

@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFrameworkIdentifier) != '.NETFramework' ">
-    <ProjectReference Include="..\..\roslyn\IronPython.Analyzer\IronPythonAnalyzer\IronPythonAnalyzer.csproj">
+    <ProjectReference Include="..\..\roslyn\IronPython.Analyzer\IronPythonAnalyzer.csproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <OutputItemType>Analyzer</OutputItemType>
     </ProjectReference>

src/core/IronPython/IronPython.csproj

@@ -58,7 +58,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFrameworkIdentifier) != '.NETFramework' ">
-    <ProjectReference Include="..\..\roslyn\IronPython.Analyzer\IronPythonAnalyzer\IronPythonAnalyzer.csproj">
+    <ProjectReference Include="..\..\roslyn\IronPython.Analyzer\IronPythonAnalyzer.csproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <OutputItemType>Analyzer</OutputItemType>
     </ProjectReference>

src/core/IronPython/Lib/iptest/ipunittest.py

@@ -128,8 +128,8 @@ def setUp(self):
         self.ensure_directory_present(self._temporary_dir)
 
         self._iron_python_test_dll = _iron_python_test_dll
-        self._test_dir = os.path.join(_root, 'Tests')
-        self._test_inputs_dir = os.path.join(_root, 'Tests', 'Inputs')
+        self._test_dir = os.path.join(_root, 'tests', 'suite')
+        self._test_inputs_dir = os.path.join(_root, 'tests', 'suite', 'Inputs')
 
     def add_reference_to_dlr_core(self):
         _add_reference_to_dlr_core()

tests/IronPython.Tests/EngineTest.cs

@@ -53,7 +53,7 @@ internal class Common {
         static Common() {
             RuntimeDirectory = Path.GetDirectoryName(typeof(PythonContext).Assembly.Location);
             RootDirectory = FindRoot();
-            ScriptTestDirectory = Path.Combine(RootDirectory, "Tests");
+            ScriptTestDirectory = Path.Combine(RootDirectory, "tests", "suite");
             InputTestDirectory = Path.Combine(ScriptTestDirectory, "Inputs");
         }