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 2007/12/12 10:45:57 UTC
svn commit: r603524 -
/harmony/enhanced/buildtest/branches/2.0/adaptors/jedit_test/adaptor.xml
Author: smishura
Date: Wed Dec 12 01:45:57 2007
New Revision: 603524
URL: http://svn.apache.org/viewvc?rev=603524&view=rev
Log:
Move check for vm availability from 'setup' to 'run' target.
(VM may absent during suite setup)
Modified:
harmony/enhanced/buildtest/branches/2.0/adaptors/jedit_test/adaptor.xml
Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/jedit_test/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/jedit_test/adaptor.xml?rev=603524&r1=603523&r2=603524&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/jedit_test/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/jedit_test/adaptor.xml Wed Dec 12 01:45:57 2007
@@ -54,14 +54,6 @@
target: setup
================================= -->
<target name="setup">
- <condition property="tested.vm.exist">
- <or>
- <available file="${jedit_test.tested.runtime}/bin/java"/>
- <available file="${jedit_test.tested.runtime}/bin/java.exe"/>
- </or>
- </condition>
- <fail message="Can't find java executable in: ${jedit_test.tested.runtime}/bin" unless="tested.vm.exist"/>
-
<svn-update-bt path="${test.sources.dir}/${suite.name}"/>
<external-ant-build target="setup"
@@ -78,6 +70,14 @@
<tstamp>
<format property="time.stamp" pattern="yyyy-MM-dd_HHmm" />
</tstamp>
+
+ <condition property="tested.vm.exist">
+ <or>
+ <available file="${jedit_test.tested.runtime}/bin/java"/>
+ <available file="${jedit_test.tested.runtime}/bin/java.exe"/>
+ </or>
+ </condition>
+ <fail message="Can't find java executable in: ${jedit_test.tested.runtime}/bin" unless="tested.vm.exist"/>
<external-ant-build target="launch"
failonerror="false"