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/06/07 04:55:22 UTC
svn commit: r664251 - in /harmony/enhanced/buildtest/trunk/infra:
adaptors/make-snapshot/adaptor.xml adaptors/make-snapshot/parameters.xml
scripts/cc-exec-adaptor.xml
Author: smishura
Date: Fri Jun 6 19:55:22 2008
New Revision: 664251
URL: http://svn.apache.org/viewvc?rev=664251&view=rev
Log:
Fix make-snapshot suite:
- do checkout & populate-src during setup
- ${suite.adaptor.dir} -> ${adaptors.dir}/make-snapshot
- add 'available' to condition in cc-exec
Modified:
harmony/enhanced/buildtest/trunk/infra/adaptors/make-snapshot/adaptor.xml
harmony/enhanced/buildtest/trunk/infra/adaptors/make-snapshot/parameters.xml
harmony/enhanced/buildtest/trunk/infra/scripts/cc-exec-adaptor.xml
Modified: harmony/enhanced/buildtest/trunk/infra/adaptors/make-snapshot/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/adaptors/make-snapshot/adaptor.xml?rev=664251&r1=664250&r2=664251&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/adaptors/make-snapshot/adaptor.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/adaptors/make-snapshot/adaptor.xml Fri Jun 6 19:55:22 2008
@@ -19,7 +19,11 @@
<!-- initial setup of the HDK workspace -->
<target name="setup">
- <mkdir dir="${trunk.dir}"/>
+ <mkdir dir="${trunk.dir}" />
+ <exec executable="svn" dir="${trunk.dir}" failonerror="true">
+ <arg line="co ${svn.url} ." />
+ </exec>
+ <exec-ant dir="${trunk.dir}" targets="populate-src" />
</target>
<target name="run" depends="do-build,upload"/>
Modified: harmony/enhanced/buildtest/trunk/infra/adaptors/make-snapshot/parameters.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/adaptors/make-snapshot/parameters.xml?rev=664251&r1=664250&r2=664251&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/adaptors/make-snapshot/parameters.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/adaptors/make-snapshot/parameters.xml Fri Jun 6 19:55:22 2008
@@ -36,7 +36,7 @@
</shared>
<cc trigger="${trunk.dir}/release.properties"
- bootstrapper="${suite.adaptor.dir}/adaptor.xml"
+ bootstrapper="${adaptors.dir}/make-snapshot/adaptor.xml"
/>
</parameters>
Modified: harmony/enhanced/buildtest/trunk/infra/scripts/cc-exec-adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/scripts/cc-exec-adaptor.xml?rev=664251&r1=664250&r2=664251&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/scripts/cc-exec-adaptor.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/scripts/cc-exec-adaptor.xml Fri Jun 6 19:55:22 2008
@@ -72,8 +72,11 @@
<attribute name="suite"/>
<sequential>
<condition property="is.snapshot">
- <contains string="${@{suite}.parameters.depends}"
- substring="snapshot"/>
+ <and>
+ <contains string="${@{suite}.parameters.depends}"
+ substring="snapshot" />
+ <available file="${config.dir}/snapshot.properties" />
+ </and>
</condition>
</sequential>
</macrodef>