8164481: Remove jtreg run configurations from langtools idea project
Summary: Update langtools intellij project and related ant build files.
Reviewed-by: jlahoda
--- a/langtools/make/build.xml Thu Aug 18 21:33:52 2016 +0000
+++ b/langtools/make/build.xml Fri Aug 19 16:45:22 2016 +0100
@@ -246,10 +246,12 @@
<condition property="idea.target.jdk" value="${langtools.jdk.home}" else = "$JDKPath$">
<isset property="langtools.jdk.home"/>
</condition>
- <replace file=".idea/ant.xml" token="@IDEA_JTREG_HOME@" value="${idea.jtreg.home}"/>
<replace file=".idea/ant.xml" token="@IDEA_TARGET_JDK@" value="${idea.target.jdk}"/>
<replace dir=".idea/runConfigurations" token="@IDEA_TARGET_JDK@" value="${idea.target.jdk}"/>
<replace dir=".idea/runConfigurations" token="@XPATCH@" value="${xpatch.cmd}"/>
+ <replace file=".idea/misc.xml" token="@IDEA_JTREG_HOME@" value="${idea.jtreg.home}"/>
+ <replace file=".idea/misc.xml" token="@IDEA_TARGET_JDK@" value="${idea.target.jdk}"/>
+ <replace file=".idea/misc.xml" token="@XPATCH@" value="${xpatch.cmd}"/>
<mkdir dir=".idea/classes"/>
<javac source="${javac.build.source}"
target="${javac.build.target}"
--- a/langtools/make/intellij/ant.xml Thu Aug 18 21:33:52 2016 +0000
+++ b/langtools/make/intellij/ant.xml Fri Aug 19 16:45:22 2016 +0100
@@ -3,10 +3,7 @@
<component name="AntConfiguration">
<buildFile url="file://$PROJECT_DIR$/.idea/build.xml">
<properties>
- <property name="jtreg.tests" value="$FilePath$" />
- <property name="langtools.jdk.home" value="@IDEA_TARGET_JDK@" />
- <property name="jtreg.home" value="@IDEA_JTREG_HOME@" />
- <property name="jtreg.jpda.jvmargs" value="-agentlib:jdwp=transport=dt_socket,server=n,suspend=y,address=5900" />
+ <property name="langtools.jdk.home" value="@IDEA_TARGET_JDK@" />
</properties>
<executeOn event="afterCompilation" target="post-make" />
</buildFile>
--- a/langtools/make/intellij/build.xml Thu Aug 18 21:33:52 2016 +0000
+++ b/langtools/make/intellij/build.xml Fri Aug 19 16:45:22 2016 +0100
@@ -8,32 +8,5 @@
<import file="../make/build.xml"/>
- <macrodef name="exec-target">
- <attribute name="antfile" default="${ant.file}" />
- <attribute name="target" />
- <sequential>
- <java classname="org.apache.tools.ant.Main" fork="true" spawn="true">
- <arg value="-f"/>
- <arg value="@{antfile}"/>
- <arg value="-Dlangtools.jdk.home=${langtools.jdk.home}"/>
- <arg value="-Djtreg.home=${jtreg.home}"/>
- <arg value="-Djtreg.tests=${jtreg.tests}"/>
- <arg value="-Djtreg.jpda.jvmargs=${jtreg.jpda.jvmargs}"/>
- <arg value="@{target}"/>
- <classpath>
- <pathelement path="${java.class.path}"/>
- </classpath>
- </java>
- </sequential>
- </macrodef>
-
<target name="post-make" depends="clean, build-all-tools"/>
-
- <target name="jtreg-debug" depends="build-all-tools, -def-jtreg">
- <exec-target target="jtreg-debug-internal"/>
- </target>
-
- <target name="jtreg-debug-internal" depends="-def-jtreg">
- <jtreg-tool name="all" tests="${jtreg.tests}" options="-conc:1" jpda.jvmargs="${jtreg.jpda.jvmargs}"/>
- </target>
</project>
--- a/langtools/make/intellij/langtools.iml Thu Aug 18 21:33:52 2016 +0000
+++ b/langtools/make/intellij/langtools.iml Fri Aug 19 16:45:22 2016 +0100
@@ -7,7 +7,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/jdk.javadoc/share/classes" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/jdk.jdeps/share/classes" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/jdk.jshell/share/classes" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/build/gensrc/jdk.compiler" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/gensrc/jdk.javadoc" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/gensrc/jdk.jdeps" isTestSource="false" />
--- a/langtools/make/intellij/misc.xml Thu Aug 18 21:33:52 2016 +0000
+++ b/langtools/make/intellij/misc.xml Fri Aug 19 16:45:22 2016 +0100
@@ -3,6 +3,13 @@
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
+ <component name="JTRegService">
+ <option name="JTRegDir" value="@IDEA_JTREG_HOME@" />
+ <option name="JTRegOptions" value='@XPATCH@' />
+ <option name="alternativeJrePath" value="@IDEA_TARGET_JDK@" />
+ <option name="alternativeJrePathEnabled" value="true" />
+ <option name="workDir" value="build" />
+ </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/.idea/out" />
</component>
--- a/langtools/make/intellij/runConfigurations/jtreg__debug_.xml Thu Aug 18 21:33:52 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<component name="ProjectRunConfigurationManager">
- <configuration default="false" name="jtreg (debug)" type="Remote" factoryName="Remote" singleton="true">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="true" />
- <option name="SHMEM_ADDRESS" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5900" />
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="5900" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="false" />
- </RunnerSettings>
- <ConfigurationWrapper RunnerId="Debug" />
- <method>
- <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/.idea/build.xml" target="jtreg-debug" />
- </method>
- </configuration>
-</component>
--- a/langtools/make/intellij/runConfigurations/jtreg__run_.xml Thu Aug 18 21:33:52 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<component name="ProjectRunConfigurationManager">
- <configuration default="false" name="jtreg (run)" type="AntRunConfiguration" factoryName="Ant Target">
- <antsettings antfile="file://$PROJECT_DIR$/.idea/build.xml" target="jtreg" />
- <method>
- <option name="Make" enabled="false" />
- </method>
- </configuration>
-</component>
--- a/langtools/make/intellij/utils/jtreg-live-templates.xml Thu Aug 18 21:33:52 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<!--
-The following live template declarations allow for automatic generation of jtreg test headers.
-Unfortunately, live templates cannot be shared on a per project base, but they can be easily imported
-by cutting and paste the following lines inside IntelliJ LiveTemplate settings (this will need to be done only once).
--->
-
-<template name="@test" value="@test * @bug $BUG_ID$ * @summary $BUG_SUMMARY$ * $JTREG_ACTION$ $FILE_NAME$" description="jtreg header (positive test)" toReformat="false" toShortenFQNames="true">
- <variable name="BUG_ID" expression="groovyScript("_1 ==~ /T\\d{7}/ ? _1.substring(1).take(7) : 'NNNNNNN'", fileNameWithoutExtension())" defaultValue="" alwaysStopAt="true" />
- <variable name="BUG_SUMMARY" expression=""Bug summary"" defaultValue="" alwaysStopAt="true" />
- <variable name="JTREG_ACTION" expression=""@compile"" defaultValue="" alwaysStopAt="true" />
- <variable name="FILE_NAME" expression="fileName()" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="JAVA_COMMENT" value="true" />
- </context>
-</template>
-<template name="@test /nodynamiccopyright/" value="@test * @bug $BUG_ID$ * @summary $BUG_SUMMARY$ * $JTREG_ACTION$/fail/ref=$GOLDEN_NAME$ -XDrawDiagnostics $FILE_NAME$" description="jtreg header (negative test)" toReformat="false" toShortenFQNames="true">
- <variable name="BUG_ID" expression="groovyScript("_1 ==~ /T\\d{7}/ ? _1.substring(1).take(7) : 'NNNNNNN'", fileNameWithoutExtension())" defaultValue="NNNNNNN" alwaysStopAt="true" />
- <variable name="BUG_SUMMARY" expression=""Bug summary"" defaultValue="" alwaysStopAt="true" />
- <variable name="JTREG_ACTION" expression=""@compile"" defaultValue="" alwaysStopAt="true" />
- <variable name="GOLDEN_NAME" expression="groovyScript("_1 + '.out'", fileNameWithoutExtension())" defaultValue="out.txt" alwaysStopAt="true" />
- <variable name="FILE_NAME" expression="fileName()" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="JAVA_COMMENT" value="true" />
- </context>
-</template>
--- a/langtools/make/intellij/workspace.xml Thu Aug 18 21:33:52 2016 +0000
+++ b/langtools/make/intellij/workspace.xml Fri Aug 19 16:45:22 2016 +0100
@@ -12,8 +12,6 @@
<filter targetName="build-all-tools" isVisible="true" />
<filter targetName="build-all-classes" isVisible="true" />
<filter targetName="clean" isVisible="true" />
- <filter targetName="jtreg" isVisible="true" />
- <filter targetName="jtreg-debug" isVisible="true" />
<filter targetName="crules" isVisible="true" />
</targetFilters>
<viewClosedWhenNoErrors value="true" />