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

Run tests with JDK 1.8 and remove hack with downloading libraries from previous ide

Browse Source
This commit is contained in:
Nikolay Krasko
2017-01-18 20:59:40 +03:00
committed by Nikolay Krasko
parent fe8e02f4cf
commit 110fc103de
3 changed files with 3 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests-common.iml
+1 -36
View File
@@ -29,41 +29,6 @@
<orderEntry type="library" scope="TEST" name="kotlin-test" level="project" /> <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
<orderEntry type="library" scope="TEST" name="junit-4.12" level="project" /> <orderEntry type="library" scope="TEST" name="junit-4.12" level="project" />
<orderEntry type="library" name="intellij-core" level="project" /> <orderEntry type="library" name="intellij-core" level="project" />
<orderEntry type="module-library"> <orderEntry type="library" name="idea-full" level="project" />
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../ideaSDK/lib/commons-httpclient-3.1-patched.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../dependencies/download/idea-for-compiler-test/idea_rt.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../dependencies/download/idea-for-compiler-test/openapi.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../ideaSDK/core/asm-all.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component> </component>
</module> </module>
compiler/tests/compiler-tests.iml
+1 -36
View File
@@ -30,45 +30,10 @@
<orderEntry type="library" scope="TEST" name="kotlin-test" level="project" /> <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
<orderEntry type="library" scope="TEST" name="junit-4.12" level="project" /> <orderEntry type="library" scope="TEST" name="junit-4.12" level="project" />
<orderEntry type="library" name="intellij-core" level="project" /> <orderEntry type="library" name="intellij-core" level="project" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../ideaSDK/lib/commons-httpclient-3.1-patched.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../dependencies/download/idea-for-compiler-test/idea_rt.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../dependencies/download/idea-for-compiler-test/openapi.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../ideaSDK/core/asm-all.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<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="backend.common" scope="TEST" />
<orderEntry type="module" module-name="ir.psi2ir" scope="TEST" /> <orderEntry type="module" module-name="ir.psi2ir" scope="TEST" />
<orderEntry type="module" module-name="ir.ir2cfg" scope="TEST" /> <orderEntry type="module" module-name="ir.ir2cfg" scope="TEST" />
<orderEntry type="library" name="idea-full" level="project" />
</component> </component>
</module> </module>
update_dependencies.xml
+1 -13
View File
@@ -177,7 +177,7 @@
</jar> </jar>
</target> </target>
<target name="fetch-third-party" depends="make-dependency-dirs, make-native-platform-uberjar, fetch-idea-artifacts-for-compiler-tests"> <target name="fetch-third-party" depends="make-dependency-dirs, make-native-platform-uberjar">
<antcall target="override-version"/> <antcall target="override-version"/>
<!-- ProGuard --> <!-- ProGuard -->
@@ -845,18 +845,6 @@
--> -->
<target name="fetch-annotations"/> <target name="fetch-annotations"/>
<target name="fetch-idea-artifacts-for-compiler-tests">
<!-- For running compiler tests with Java 1.6 -->
<local name="idea.for.compiler.testing.dir"/>
<property name="idea.for.compiler.testing.dir" value="dependencies/download/idea-for-compiler-test"/>
<mkdir dir="${idea.for.compiler.testing.dir}"/>
<local name="idea.for.compiler.testing.base.url"/>
<property name="idea.for.compiler.testing.base.url"
value="https://teamcity.jetbrains.com/guestAuth/repository/download/IntelliJIdeaCe_OpenapiJar/idea-15.0.5"/>
<get src="${idea.for.compiler.testing.base.url}/idea_rt.jar" dest="${idea.for.compiler.testing.dir}/idea_rt.jar" usetimestamp="true"/>
<get src="${idea.for.compiler.testing.base.url}/openapi.jar" dest="${idea.for.compiler.testing.dir}/openapi.jar" usetimestamp="true"/>
</target>
<target name="get_android_studio"> <target name="get_android_studio">
<condition property="android.os.tag" value="windows"> <condition property="android.os.tag" value="windows">
<os family="windows"/> <os family="windows"/>