azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move IR tests to module 'compiler-tests'

Browse Source 
(due to dependencies on classes from 'compiler-tests').

Minor: remove unused imports.
This commit is contained in:
Dmitry Petrov
2016-09-09 16:08:56 +03:00
committed by Dmitry Petrov
parent 00a74699e2
commit 00093ac901
9 changed files with 5 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/modules.xml
Generated
-1
View File
@@ -54,7 +54,6 @@
<module fileurl="file://$PROJECT_DIR$/idea/idea-test-framework/idea-test-framework.iml" filepath="$PROJECT_DIR$/idea/idea-test-framework/idea-test-framework.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/compiler/preloader/instrumentation/instrumentation.iml" filepath="$PROJECT_DIR$/compiler/preloader/instrumentation/instrumentation.iml" group="compiler/cli" />
<module fileurl="file://$PROJECT_DIR$/compiler/ir/ir.psi2ir/ir.psi2ir.iml" filepath="$PROJECT_DIR$/compiler/ir/ir.psi2ir/ir.psi2ir.iml" group="compiler/ir" />
<module fileurl="file://$PROJECT_DIR$/compiler/ir/ir.tests/ir.tests.iml" filepath="$PROJECT_DIR$/compiler/ir/ir.tests/ir.tests.iml" group="compiler/ir" />
<module fileurl="file://$PROJECT_DIR$/compiler/ir/ir.tree/ir.tree.iml" filepath="$PROJECT_DIR$/compiler/ir/ir.tree/ir.tree.iml" group="compiler/ir" />
<module fileurl="file://$PROJECT_DIR$/j2k/j2k.iml" filepath="$PROJECT_DIR$/j2k/j2k.iml" group="j2k" />
<module fileurl="file://$PROJECT_DIR$/plugins/java-model-wrappers/java-model-wrappers.iml" filepath="$PROJECT_DIR$/plugins/java-model-wrappers/java-model-wrappers.iml" group="plugins" />
compiler/ir/ir.tests/ir.tests.iml
-21
View File
@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="util" />
<orderEntry type="module" module-name="tests-common" scope="TEST" />
<orderEntry type="library" name="intellij-core" level="project" />
<orderEntry type="module" module-name="cli" scope="TEST" />
<orderEntry type="module" module-name="frontend" scope="TEST" />
<orderEntry type="module" module-name="ir.tree" scope="TEST" />
<orderEntry type="module" module-name="ir.psi2ir" scope="TEST" />
<orderEntry type="library" scope="TEST" name="junit-4.12" level="project" />
<orderEntry type="module" module-name="backend.common" scope="TEST" />
<orderEntry type="module" module-name="compiler-tests" scope="TEST" />
</component>
</module>
compiler/tests/compiler-tests.iml
+5 -1
View File
@@ -66,6 +66,10 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module" module-name="ir.tests" scope="TEST" />
<orderEntry type="module" module-name="ir.tree" scope="TEST" />
<orderEntry type="module" module-name="ir.tree" scope="TEST" />
<orderEntry type="module" module-name="ir.tree" scope="TEST" />
<orderEntry type="module" module-name="backend.common" scope="TEST" />
<orderEntry type="module" module-name="ir.psi2ir" scope="TEST" />
</component>
</module>
compiler/ir/ir.tests/tests/org/jetbrains/kotlin/ir/AbstractClosureAnnotatorTestCase.kt → compiler/tests/org/jetbrains/kotlin/ir/AbstractClosureAnnotatorTestCase.kt
View File
compiler/ir/ir.tests/tests/org/jetbrains/kotlin/ir/AbstractIrGeneratorTestCase.kt → compiler/tests/org/jetbrains/kotlin/ir/AbstractIrGeneratorTestCase.kt
View File
compiler/ir/ir.tests/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt → compiler/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt
-2
View File
@@ -24,8 +24,6 @@ import org.jetbrains.kotlin.ir.util.dumpTreesFromLineNumber
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.utils.rethrow
import java.io.File
import java.io.FileWriter
import java.io.PrintWriter
import java.util.*
import java.util.regex.Pattern
compiler/ir/ir.tests/tests/org/jetbrains/kotlin/ir/AbstractPsi2IrBoxTestCase.kt → compiler/tests/org/jetbrains/kotlin/ir/AbstractPsi2IrBoxTestCase.kt
View File
compiler/ir/ir.tests/tests/org/jetbrains/kotlin/ir/AbstractPsi2IrDiagnosticsTest.kt → compiler/tests/org/jetbrains/kotlin/ir/AbstractPsi2IrDiagnosticsTest.kt
View File
generators/generators.iml
-1
View File
@@ -40,6 +40,5 @@
<orderEntry type="module" module-name="idea-android-output-parser" scope="TEST" />
<orderEntry type="module" module-name="idea-maven" scope="TEST" />
<orderEntry type="module" module-name="uast-kotlin" scope="TEST" />
<orderEntry type="module" module-name="ir.tests" scope="TEST" />
</component>
</module>