From 43ac20e88ac61ea5d9d819cde2caa885783d3469 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Wed, 15 Apr 2015 22:22:19 +0300
Subject: [PATCH] Move builtins dependency to the top in compiler-tests

When running tests locally, serialized built-ins located in dist/builtins
should have a higher priority than the ones in the bootstrap runtime, on which
almost every module depends by default. Also make it a 'runtime' dependency
because the binary files there can't really change anything at compile time
---
 compiler/tests/compiler-tests.iml | 1 +
 core/descriptors/descriptors.iml  | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/compiler/tests/compiler-tests.iml b/compiler/tests/compiler-tests.iml
index ceafd8af3a5..c559bc274df 100644
--- a/compiler/tests/compiler-tests.iml
+++ b/compiler/tests/compiler-tests.iml
@@ -7,6 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="descriptors" />
     <orderEntry type="module" module-name="backend" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
diff --git a/core/descriptors/descriptors.iml b/core/descriptors/descriptors.iml
index 635cf2db3ee..a15cd6ab830 100644
--- a/core/descriptors/descriptors.iml
+++ b/core/descriptors/descriptors.iml
@@ -7,8 +7,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" scope="RUNTIME" name="builtins" level="project" />
     <orderEntry type="module" module-name="util.runtime" />
     <orderEntry type="module" module-name="deserialization" />
-    <orderEntry type="library" exported="" name="builtins" level="project" />
+    <orderEntry type="library" name="javax.inject" level="project" />
   </component>
 </module>
\ No newline at end of file