You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2013/12/29 00:09:01 UTC
svn commit: r1553962 - in /ofbiz/trunk: build.xml framework/base/build.xml
Author: jleroux
Date: Sat Dec 28 23:09:01 2013
New Revision: 1553962
URL: http://svn.apache.org/r1553962
Log:
This completes "set different ports for testing in a CI environment (e.g. Jenkins)" https://issues.apache.org/jira/browse/OFBIZ-4794
This was waiting for a moment in my working copy after I found that there was an issue with testSOAPSimpleService when portoffset was used with run-tests target.
I have still no resolved this issue, but since I got a better way to run simultaneous Buildbot instances this is no longer an issue for run-tests target.
So I commit these small pending changes in order to allow to run Sonar on OFBiz https://issues.apache.org/jira/browse/INFRA-3590.
The cobertura target does not work yet but what's committed here is needed anyway to progress with INFRA-3590.
Modified:
ofbiz/trunk/build.xml
ofbiz/trunk/framework/base/build.xml
Modified: ofbiz/trunk/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1553962&r1=1553961&r2=1553962&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Sat Dec 28 23:09:01 2013
@@ -910,12 +910,13 @@ under the License.
</target>
<target name="run-tests"
- description="Run OFBiz default tests; you have to manually execute 'ant load-demo' before (and if needed even clear your data before) and see results in runtime/logs/test-results/html/all-tests.html.">
+ description="Run OFBiz default tests; you have to manually execute 'ant load-demo' before (and if needed even clear your data before) and see results in runtime/logs/test-results/html/all-tests.html. Use -Dportoffset=portNumber to shift all ports with the portNumber value.">
<java jar="ofbiz.jar" fork="true" resultproperty="test.result">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
<jvmarg value="${memory.maxpermsize.param}"/>
<arg value="test"/>
+ <arg value="-portoffset=${portoffset}"/>
<env key="LC_ALL" value="C"/>
</java>
<mkdir dir="runtime/logs/test-results/html"/>
@@ -1063,8 +1064,8 @@ under the License.
</cobertura-report>
</target>
- <target name="cobertura-report-xml"
- description="Generate a XML file from the cobertura report, this will be use by sonar">
+ <target name="cobertura-report-xml" depends="_setup-separated-test-run"
+ description="Generate a XML file from the cobertura report, this will be used by sonar">
<delete dir="runtime/logs/cobertura-report"/>
<mkdir dir="runtime/logs/cobertura-report"/>
<taskdef resource="tasks.properties">
@@ -1136,7 +1137,10 @@ under the License.
<target name="full-sonar">
<antcall target="clean-all"/>
<antcall target="load-demo"/>
- <antcall target="run-tests"/>
+ <antcall target="download-cobertura"/>
+ <antcall target="run-tests">
+ <param name="-portoffset" value="${portoffset}"/>
+ </antcall>
<antcall target="cobertura-report-xml"/>
<antcall target="sonar"/>
</target>
Modified: ofbiz/trunk/framework/base/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/build.xml?rev=1553962&r1=1553961&r2=1553962&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/build.xml (original)
+++ ofbiz/trunk/framework/base/build.xml Sat Dec 28 23:09:01 2013
@@ -70,13 +70,7 @@ under the License.
<available classname="javax.crypto.Cipher" classpathref="local.class.path"/>
</not>
</condition>
- <condition property="exclude.cobertura" value="org/ofbiz/base/config/Cobertura*.java">
- <not>
- <available classname="net.sourceforge.cobertura.instrument.ClassInstrumenter" classpathref="local.class.path"/>
- </not>
- </condition>
<patternset id="src.exc.set">
- <exclude name="${exclude.cobertura}"/>
<exclude name="${exclude.crypto}"/>
<exclude name="org/ofbiz/base/util/OfbizJsBsfEngine.java"/>
</patternset>