aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Kornilov2014-08-05 10:24:14 (EDT)
committerLukas Jungmann2014-08-06 09:35:10 (EDT)
commitbe8bb3e3264e5b94cadbab69f0039238bf0dba34 (patch)
treef713c355086a3f2a533b7e2a749db3530fe02ee2
parentd763bcc9e6e541b47cf443ddac17fae1293816f8 (diff)
downloadeclipselink.runtime-be8bb3e3264e5b94cadbab69f0039238bf0dba34.zip
eclipselink.runtime-be8bb3e3264e5b94cadbab69f0039238bf0dba34.tar.gz
eclipselink.runtime-be8bb3e3264e5b94cadbab69f0039238bf0dba34.tar.bz2
Bug #441186: remoteDebug command line switch in JPARS tests module. jpars.test.class property renamed to test.class.
Signed-off-by: Dmitry Kornilov <dmitry.kornilov@oracle.com>
-rw-r--r--antbuild.xml1
-rw-r--r--jpa/eclipselink.jpars.test/antbuild.xml17
-rw-r--r--jpa/eclipselink.jpars.test/test.properties2
3 files changed, 16 insertions, 4 deletions
diff --git a/antbuild.xml b/antbuild.xml
index 2f63d67..a0fa307 100644
--- a/antbuild.xml
+++ b/antbuild.xml
@@ -99,6 +99,7 @@
<echo message="user.home = '${user.home}'"/>
<echo message="Loading user properties from: '${user.home}/build.properties'"/>
<property file="${user.home}/build.properties"/>
+ <property file="${test.properties}"/>
<!-- Sets default junit.lib and all extensions.depend dir locations to static paths -->
<!-- temporary until all build files reworked -->
<property name="oracle.extensions.depend.dir" value="${trunk.build.location}/../extension.oracle.lib.external"/>
diff --git a/jpa/eclipselink.jpars.test/antbuild.xml b/jpa/eclipselink.jpars.test/antbuild.xml
index 0c66062..8f05ecb 100644
--- a/jpa/eclipselink.jpars.test/antbuild.xml
+++ b/jpa/eclipselink.jpars.test/antbuild.xml
@@ -31,6 +31,7 @@
* Contributors:
* bdoughan, dtwelves, egwin - initial API and implementation from SDO test project
* tware - modified for jpa rs tests
+* Dmitry Kornilov - remoteDebug property added
#******************************************************************************/-->
<project name="eclipselink.jpars.test" default="test" basedir=".">
<available file="../${ant.project.name}" type="dir" property="jparstest.is.local"/>
@@ -56,10 +57,10 @@
<condition property="jparstest.2.jpa.plugins.dir" value="${jparstest.2.base.dir}/jpa/plugins" else="../plugins">
<available file="${jparstest.2.base.dir}/jpa/plugins" type="dir"/>
</condition>
- <property name="jparstest.2.buildsys.dir" value="${jparstest.2.base.dir}/buildsystem"/>
+ <property name="jparstest.2.buildsys.dir" value="${jparstest.2.base.dir}/buildsystem"/>
<condition property="custom.properties.message" value="Loading ${user.home}/build.properties..."
- else="Custom properties file '${user.home}/build.properties' not found to load.">
+ else="Custom properties file '${user.home}/build.properties' not found to load.">
<available file="${user.home}/build.properties"/>
</condition>
<echo message="${custom.properties.message}"/>
@@ -229,6 +230,7 @@
</target>
<!-- Run targets -->
+ <!-- Use -DremoteDebug=true to enable remote debugging on 8787 port -->
<target name="test" depends="compile-jpars-tests" description="run jpars tests">
<property name="SERVER_URL" value="http://localhost:7001"/>
<property name="JPARS_VERSION" value="v1.0"/>
@@ -303,6 +305,14 @@
<fileset dir="${jparstest.build.location}/${src.dir}/META-INF" includes="**"/>
</copy>
+ <!-- Use -DremoteDebug=true to enable remote debugging on 8787 port -->
+ <property name="remoteDebug" value="false"/>
+ <condition property="remoteDebugJvmArgs"
+ value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8787"
+ else="-ea">
+ <istrue value="${remoteDebug}"/>
+ </condition>
+
<!-- Fix for 290177 below removed temporarily to avoid out-of-memeory issues with LRG run -->
<!-- junit printsummary="withOutAndErr" fork="yes" forkmode="once" dir="${resource.dir}" maxmemory="512m" showoutput="yes" -->
<junit printsummary="withOutAndErr" fork="yes" dir="${classes.dir}" maxmemory="512m" showoutput="yes">
@@ -312,6 +322,7 @@
<jvmarg value="-Ddb.user=${db.user}"/>
<jvmarg value="-Ddb.pwd=${db.pwd}"/>
<jvmarg value="-javaagent:../${jparstest.2.base.dir}/${eclipselink.jar}"/>
+ <jvmarg value="${remoteDebugJvmArgs}"/>
<!--jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8787"/-->
<sysproperty key="loggingLevelFinest" value="false"/>
<sysproperty key="tempFileDir" value="${tmp.dir}"/>
@@ -325,7 +336,7 @@
<sysproperty key="jpars.version.string" value="${JPARS_VERSION}"/>
<batchtest todir="${report.dir}">
<fileset dir="${src.dir}">
- <include name="${jpars.test.class}"/>
+ <include name="${test.class}"/>
</fileset>
<formatter type="xml"/>
</batchtest>
diff --git a/jpa/eclipselink.jpars.test/test.properties b/jpa/eclipselink.jpars.test/test.properties
index ebc1345..4b3a404 100644
--- a/jpa/eclipselink.jpars.test/test.properties
+++ b/jpa/eclipselink.jpars.test/test.properties
@@ -53,4 +53,4 @@ eclipselink.logging.level.ejb_or_metadata=WARNING
eclipselink.target-server=NONE
-jpars.test.class=org/eclipse/persistence/jpars/test/AllJavaSETests.java
+test.class=org/eclipse/persistence/jpars/test/AllJavaSETests.java