Thanks Jonathan,
I'll get back to working on jtreg shortly, I plan on reversing out some
recent changes to policy files then generating the test.props file
within build.xml[qa]'s jtreg target. That should be sufficient for a
release, although it'd be nice to setup the kerberos kdc server and a
squid proxy on river.zones.apache.org also, once the tests are running
on Hudson.
Cheers,
Peter.
[email protected] wrote:
Author: jcosters
Date: Wed Oct 7 19:35:03 2009
New Revision: 822869
URL: http://svn.apache.org/viewvc?rev=822869&view=rev
Log:
RIVER-304: restored jtreg-teardown target
Modified:
incubator/river/jtsk/trunk/qa/build.xml
Modified: incubator/river/jtsk/trunk/qa/build.xml
URL:
http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/build.xml?rev=822869&r1=822868&r2=822869&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/build.xml (original)
+++ incubator/river/jtsk/trunk/qa/build.xml Wed Oct 7 19:35:03 2009
@@ -180,6 +180,20 @@
<fail if="jtreg.fail"/>
</target>
+ <!-- Run this in case the jtreg target got cancelled somehow before moving the JARs back -->
+ <target name="jtreg-teardown" depends="" description="Move back JARs">
+ <move todir="${river.lib.dir}">
+ <filelist dir="${jtreg.dir}/JTlib-tmp">
+ <file name="jsk-lib.jar"/>
+ <file name="jsk-platform.jar"/>
+ <file name="jsk-resources.jar"/>
+ <file name="phoenix-init.jar"/>
+ </filelist>
+ </move>
+ <move file="${jtreg.dir}/JTlib-tmp/jsk-policy.jar"
todir="${river.lib-ext.dir}"/>
+ <delete dir="${jtreg.dir}/JTlib-tmp"/>
+ </target>
+
<macrodef name="testrun">
<element name="tr-elements" optional="true" implicit="true"/>
<sequential>
