Merge remote-tracking branch 'origin/master' into develar/is
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Mon, 18 Jul 2016 09:22:38 +0000 (11:22 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Mon, 18 Jul 2016 09:22:38 +0000 (11:22 +0200)
# Conflicts:
# platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
# platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java

1  2 
java/java-analysis-impl/src/com/intellij/codeInspection/ex/EntryPointsManagerBase.java
java/testFramework/src/com/intellij/testFramework/InspectionTestCase.java
platform/lang-impl/src/com/intellij/codeInspection/ui/DefaultInspectionToolPresentation.java
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java
platform/platform-resources/src/META-INF/LangExtensionPoints.xml
platform/testFramework/src/com/intellij/testFramework/InspectionTestUtil.java
platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
platform/util/resources/misc/registry.properties

index fbb0fb6f1f0f811a0d93f77639a3751292f482a8,3ca59f8a8ac1e15681c4366aeef5435ac7af0936..9a1e49e88f35c5ff9e3f8b8514a7314eea48cc45
@@@ -134,7 -136,11 +133,11 @@@ public abstract class LightPlatformTest
    private static LightProjectDescriptor ourProjectDescriptor;
  
    private ThreadTracker myThreadTracker;
 -  
 +
+   static {
+     PlatformTestUtil.registerProjectCleanup(LightPlatformTestCase::closeAndDeleteProject);
+   }
    /**
     * @return Project to be used in tests for example for project components retrieval.
     */