Author: jawi
Date: Fri Jul 13 13:00:41 2012
New Revision: 1361190
URL: http://svn.apache.org/viewvc?rev=1361190&view=rev
Log:
Fixed the test-build by creating an empty source folder.
Added:
ace/sandbox/marrs/build/src/
Modified:
ace/sandbox/marrs/build/bnd.bnd
ace/sandbox/marrs/cnf/build.xml
Modified: ace/sandbox/marrs/build/bnd.bnd
URL:
http://svn.apache.org/viewvc/ace/sandbox/marrs/build/bnd.bnd?rev=1361190&r1=1361189&r2=1361190&view=diff
==============================================================================
--- ace/sandbox/marrs/build/bnd.bnd (original)
+++ ace/sandbox/marrs/build/bnd.bnd Fri Jul 13 13:00:41 2012
@@ -1,10 +1,13 @@
--nobundle
+-nobundles=true
-dependson \
- org.apache.ace.authentication.api,\
+ org.apache.ace.test,\
org.apache.ace.authentication,\
+ org.apache.ace.authentication.api,\
org.apache.ace.authenticationprocessor.basicauth,\
org.apache.ace.authenticationprocessor.clientcert,\
org.apache.ace.authenticationprocessor.password,\
+ org.apache.ace.authentication.itest,\
+ org.apache.ace.builder,\
org.apache.ace.client.automation,\
org.apache.ace.client.repository.api,\
org.apache.ace.client.repository.helper.base,\
@@ -12,14 +15,17 @@
org.apache.ace.client.repository.helper.configuration,\
org.apache.ace.client.repository.helper.user,\
org.apache.ace.client.repository.impl,\
+ org.apache.ace.client.repository.itest,\
org.apache.ace.client.rest,\
org.apache.ace.configurator.serveruseradmin,\
org.apache.ace.configurator.useradmin.task,\
+ org.apache.ace.configurator.useradmin.itest,\
org.apache.ace.configurator,\
org.apache.ace.connectionfactory,\
org.apache.ace.consolelogger,\
org.apache.ace.deployment.api,\
org.apache.ace.deployment.deploymentadmin,\
+ org.apache.ace.deployment.itest,\
org.apache.ace.deployment.provider.api,\
org.apache.ace.deployment.provider.base,\
org.apache.ace.deployment.provider.filebased,\
@@ -35,16 +41,19 @@
org.apache.ace.discovery.upnp,\
org.apache.ace.gateway.log.store,\
org.apache.ace.gateway.log,\
+ org.apache.ace.http.itest,\
org.apache.ace.http.redirector,\
org.apache.ace.httplistener,\
org.apache.ace.identification.api,\
org.apache.ace.identification.ifconfig,\
org.apache.ace.identification.property,\
+ org.apache.ace.launcher,\
org.apache.ace.location.upnp,\
+ org.apache.ace.log,\
org.apache.ace.log.listener,\
org.apache.ace.log.servlet,\
org.apache.ace.log.task,\
- org.apache.ace.log,\
+ org.apache.ace.log.itest,\
org.apache.ace.managementagent,\
org.apache.ace.nodelauncher.amazon,\
org.apache.ace.nodelauncher.api,\
@@ -59,11 +68,12 @@
org.apache.ace.repository.impl,\
org.apache.ace.repository.servlet,\
org.apache.ace.repository.task,\
+ org.apache.ace.repository.itest,\
org.apache.ace.resourceprocessor.useradmin,\
- org.apache.ace.scheduler.api,\
org.apache.ace.scheduler,\
- org.apache.ace.server.action.popupmessage,\
+ org.apache.ace.scheduler.api,\
org.apache.ace.server.action,\
+ org.apache.ace.server.action.popupmessage,\
org.apache.ace.server.log.store,\
org.apache.ace.server.log.ui,\
org.apache.ace.tageditor,\
Modified: ace/sandbox/marrs/cnf/build.xml
URL:
http://svn.apache.org/viewvc/ace/sandbox/marrs/cnf/build.xml?rev=1361190&r1=1361189&r2=1361190&view=diff
==============================================================================
--- ace/sandbox/marrs/cnf/build.xml (original)
+++ ace/sandbox/marrs/cnf/build.xml Fri Jul 13 13:00:41 2012
@@ -34,8 +34,11 @@
<echo message="Enter project ${project.name}"/>
<!-- Test compilation condition -->
- <available file="${project}/test" type="dir"
property="project.testpathexists" />
- <echo message="found test path: ${project.testpathexists}" />
+ <condition property="project.testpathexists">
+ <length length="0" when="greater">
+ <fileset dir="${project}/test"
erroronmissingdir="false" />
+ </length>
+ </condition>
</target>
<!--
@@ -49,9 +52,19 @@
</target>
<!--
- Test
+ TEST
+ Runs the integration tests.
-->
+ <target name="deeptest" depends="init" if="project.dependson">
+ <subant target="test" inheritAll="false"
buildpath="${project.dependson}">
+ <property name="donotrecurse" value="true" />
+ </subant>
+ </target>
+
<target name="test" depends="compile">
+ <!-- XXX this is a workaround for the fact that Bnd doesn't
inherit the runvm option -->
+ <property name="org.osgi.service.http.port" value="9000" />
+
<bnd command="test" exceptions="true" basedir="${project}" />
</target>
@@ -125,12 +138,11 @@
</target>
<target name="testng" depends="build, compiletest"
if="project.testpathexists">
- <mkdir dir="tmp" />
- <testng
classpath="${project}/bin_test:${project.buildpath}:${workspacedir}/cnf/lib/testng-6.5.2.jar"
- outputDir="tmp"
- haltOnfailure="true">
- <classfileset dir="${project}/bin_test" includes="**/*.class" />
- </testng>
+ <mkdir dir="tmp" />
+ <testng
classpath="${project}/bin_test:${project.buildpath}:${workspacedir}/cnf/lib/testng-6.5.2.jar"
+ outputDir="tmp" haltOnfailure="true">
+ <classfileset dir="${project}/bin_test"
includes="**/*.class" />
+ </testng>
</target>
<!--
