Merge branch 'rider/shalupov-small-fixes' (IDEA-CR-17322)

.idea/libraries/TestNG.xml

@@ -5,6 +5,8 @@
       <root url="jar://$PROJECT_DIR$/plugins/testng/lib/jcommander.jar!/" />
     </CLASSES>
     <JAVADOC />
-    <SOURCES />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/plugins/testng/lib/src/testng-sources.jar!/" />
+    </SOURCES>
   </library>
 </component>

platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/NativeFileWatcherImpl.java

@@ -157,7 +157,10 @@ public class NativeFileWatcherImpl extends PluggableFileWatcher {
     }
     if (names == null) return null;
 
-    String[] dirs = {PathManager.getBinPath(), PathManager.getHomePath() + "/community/bin/" + prefix, PathManager.getBinPath() + '/' + prefix};
+    String[] dirs = {PathManager.getBinPath(),
+                     PathManager.getHomePath() + "/ultimate/community/bin/" + prefix,
+                     PathManager.getHomePath() + "/community/bin/" + prefix,
+                     PathManager.getBinPath() + '/' + prefix};
     for (String dir : dirs) {
       for (String name : names) {
         File candidate = new File(dir, name);

platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java

@@ -138,7 +138,7 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro
 
   private static final String[] PREFIX_CANDIDATES = {
     "AppCode", "CLion", "CidrCommon",
-    "Python", "PyCharmCore", "Ruby", "UltimateLangXml", "Idea", "PlatformLangXml" };
+    "Python", "PyCharmCore", "Ruby", "Rider", "UltimateLangXml", "Idea", "PlatformLangXml" };
 
   /**
    * @deprecated calling this method is no longer necessary

platform/testFramework/src/com/intellij/testFramework/TestLoggerFactory.java

@@ -32,6 +32,8 @@ import java.io.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static com.intellij.openapi.application.PathManager.PROPERTY_LOG_PATH;
+
 @SuppressWarnings({"CallToPrintStackTrace", "UseOfSystemOutOrSystemErr"})
 public class TestLoggerFactory implements Logger.Factory {
   private static final String SYSTEM_MACRO = "$SYSTEM_DIR$";
@@ -56,13 +58,18 @@ public class TestLoggerFactory implements Logger.Factory {
   }
 
   private void init() {
+    if (!reconfigure()) return;
+    myInitialized = true;
+  }
+
+  public static boolean reconfigure() {
     try {
       File logXmlFile = new File(PathManager.getHomePath(), "test-log.xml");
       if (!logXmlFile.exists()) {
         logXmlFile = new File(PathManager.getBinPath(), "log.xml");
       }
       if (!logXmlFile.exists()) {
-        return;
+        return false;
       }
 
       final String logDir = getTestLogDir();
@@ -92,14 +99,17 @@ public class TestLoggerFactory implements Logger.Factory {
         FileUtil.writeToFile(ideaLog, "");
       }
 
-      myInitialized = true;
+      return true;
     }
-    catch (Exception e) {
+    catch (Throwable e) {
       e.printStackTrace();
+      return false;
     }
   }
 
   public static String getTestLogDir() {
+    if (System.getProperty(PROPERTY_LOG_PATH) != null) return System.getProperty(PROPERTY_LOG_PATH);
+
     return PathManager.getSystemPath() + "/" + LOG_DIR;
   }
 

platform/util/src/com/intellij/util/lang/UrlClassLoader.java

@@ -320,11 +320,13 @@ public class UrlClassLoader extends ClassLoader {
 
     if (!new File(libPath).exists()) {
       String platform = getPlatformName();
-      if (!new File(libPath = PathManager.getHomePath() + "/community/bin/" + platform + libFileName).exists()) {
-        if (!new File(libPath = PathManager.getHomePath() + "/bin/" + platform + libFileName).exists()) {
-          if (!new File(libPath = PathManager.getHomePathFor(IdeaWin32.class) + "/bin/" + libFileName).exists()) {
-            File libDir = new File(PathManager.getBinPath());
-            throw new UnsatisfiedLinkError("'" + libFileName + "' not found in '" + libDir + "' among " + Arrays.toString(libDir.list()));
+      if (!new File(libPath = PathManager.getHomePath() + "/ultimate/community/bin/" + platform + libFileName).exists()) {
+        if (!new File(libPath = PathManager.getHomePath() + "/community/bin/" + platform + libFileName).exists()) {
+          if (!new File(libPath = PathManager.getHomePath() + "/bin/" + platform + libFileName).exists()) {
+            if (!new File(libPath = PathManager.getHomePathFor(IdeaWin32.class) + "/bin/" + libFileName).exists()) {
+              File libDir = new File(PathManager.getBinPath());
+              throw new UnsatisfiedLinkError("'" + libFileName + "' not found in '" + libDir + "' among " + Arrays.toString(libDir.list()));
+            }
           }
         }
       }