You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by sm...@apache.org on 2008/01/29 08:19:05 UTC
svn commit: r616189 - in
/harmony/enhanced/buildtest/branches/2.0/adaptors/maven_test: adaptor.xml
parameters.xml
Author: smishura
Date: Mon Jan 28 23:19:05 2008
New Revision: 616189
URL: http://svn.apache.org/viewvc?rev=616189&view=rev
Log:
Switch to using svn module
Modified:
harmony/enhanced/buildtest/branches/2.0/adaptors/maven_test/adaptor.xml
harmony/enhanced/buildtest/branches/2.0/adaptors/maven_test/parameters.xml
Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/maven_test/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/maven_test/adaptor.xml?rev=616189&r1=616188&r2=616189&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/maven_test/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/maven_test/adaptor.xml Mon Jan 28 23:19:05 2008
@@ -19,8 +19,10 @@
BT Adaptor for maven_test
====================================================================== -->
<project name="maven_test" default="run" basedir=".">
+
+ <property name="suite.dir" value="${checkouts.dir}/maven_test" />
<property name="maven_test.results.dir" location="${results.dir}/${suite.name}"/>
- <property name="install.marker" location="${test.sources.dir}/${suite.name}/install.complete"/>
+ <property name="install.marker" location="${suite.dir}/install.complete"/>
<!-- =================================
target: setup
@@ -48,8 +50,7 @@
setup: Install, configure and build maven and its pre-requisites
</description>
- <svn-update-bt path="${test.sources.dir}/${suite.name}"/>
- <exec-ant dir="${test.sources.dir}/${suite.name}"
+ <exec-ant dir="${suite.dir}"
targets="setup"
failonerror="true"
failproperty="maven.setup.failed">
@@ -58,8 +59,8 @@
<sysproperty key="maven.src.filename" value="${maven_test.parameters.optional.maven.src.filename}"/>
<sysproperty key="maven.location" value="${ext.maven-2.0.7.location}"/>
<sysproperty key="maven.repository" value="${maven_test.parameters.optional.maven.repository.location}"/>
- <sysproperty key="work.dir" value="${checkouts.dir}/${suite.name}"/>
- <sysproperty key="maven.dir" value="${checkouts.dir}/${suite.name}"/>
+ <sysproperty key="work.dir" value="${suite.dir}"/>
+ <sysproperty key="maven.dir" value="${suite.dir}"/>
<sysproperty key="result.dir" value="${maven_test.results.dir}"/>
<sysproperty key="test.jre.home" value="${maven_test.parameters.required.tested.runtime}"/>
</exec-ant>
@@ -82,7 +83,7 @@
<fail message="Path to jre does not exist: ${tested.runtime}" if="jre.not.exist"/>
<!-- Execute test running here -->
- <exec-ant dir="${test.sources.dir}/${suite.name}"
+ <exec-ant dir="${suite.dir}"
targets="run"
failonerror="true"
failproperty="maven.run.failed">
@@ -91,8 +92,8 @@
<sysproperty key="maven.src.filename" value="${maven_test.parameters.optional.maven.src.filename}"/>
<sysproperty key="maven.location" value="${ext.maven-2.0.7.location}"/>
<sysproperty key="maven.repository" value="${maven_test.parameters.optional.maven.repository.location}"/>
- <sysproperty key="work.dir" value="${checkouts.dir}/${suite.name}"/>
- <sysproperty key="maven.dir" value="${checkouts.dir}/${suite.name}"/>
+ <sysproperty key="work.dir" value="${suite.dir}"/>
+ <sysproperty key="maven.dir" value="${suite.dir}"/>
<sysproperty key="result.dir" value="${maven_test.results.dir}"/>
<sysproperty key="vm.options" value="${maven_test.parameters.optional.tested.vm.options}"/>
<sysproperty key="test.jre.home" value="${maven_test.parameters.required.tested.runtime}"/>
Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/maven_test/parameters.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/maven_test/parameters.xml?rev=616189&r1=616188&r2=616189&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/maven_test/parameters.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/maven_test/parameters.xml Mon Jan 28 23:19:05 2008
@@ -25,10 +25,6 @@
value="${drlvm.parameters.shared.jre.dir}"/>
</required>
- <!-- Optional parameters -->
- <optional>
- </optional>
-
<!-- External dependencies -->
<external>
<maven-2.0.7
@@ -37,6 +33,10 @@
dir="maven-2.0.7"
/>
</external>
+
+ <svn>
+ <maven_test url="tests/maven_test"/>
+ </svn>
<!-- Shared parameters -->
<optional>