From dcfca72e5e5665dbd5ba8e7b8dc51752b4649335 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Wed, 29 May 2013 15:39:34 +0200
Subject: [PATCH] ignore lack of ProductivityFeaturesRegistry.xml in unit test
 mode; remove dependency from RegExpSupport on resources

---
 RegExpSupport/RegExpSupport.iml                               | 1 -
 .../featureStatistics/ProductivityFeaturesRegistryImpl.java   | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/RegExpSupport/RegExpSupport.iml b/RegExpSupport/RegExpSupport.iml
index 6fa1ddeb73d2..355cc42fcd21 100644
--- a/RegExpSupport/RegExpSupport.iml
+++ b/RegExpSupport/RegExpSupport.iml
@@ -19,7 +19,6 @@
     <orderEntry type="module" module-name="relaxng" scope="RUNTIME" />
     <orderEntry type="module" module-name="spellchecker" scope="RUNTIME" />
     <orderEntry type="module" module-name="xdebugger-impl" scope="RUNTIME" />
-    <orderEntry type="module" module-name="resources" scope="TEST" />
   </component>
 </module>
 
diff --git a/platform/platform-impl/src/com/intellij/featureStatistics/ProductivityFeaturesRegistryImpl.java b/platform/platform-impl/src/com/intellij/featureStatistics/ProductivityFeaturesRegistryImpl.java
index 4a72378a2ccc..870a163003ca 100644
--- a/platform/platform-impl/src/com/intellij/featureStatistics/ProductivityFeaturesRegistryImpl.java
+++ b/platform/platform-impl/src/com/intellij/featureStatistics/ProductivityFeaturesRegistryImpl.java
@@ -57,7 +57,9 @@ public class ProductivityFeaturesRegistryImpl extends ProductivityFeaturesRegist
       readFromXml("file:///ProductivityFeaturesRegistry.xml");
     }
     catch (Exception e) {
-      LOG.error(e);
+      if (!ApplicationManager.getApplication().isUnitTestMode()) {
+        LOG.error(e);
+      }
     }
 
     try {