Return-Path: 
 <commits-return-54099-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 63207 invoked from network); 30 Apr 2008 04:43:57 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 30 Apr 2008 04:43:57 -0000
Received: (qmail 11537 invoked by uid 500); 30 Apr 2008 04:43:59 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 11439 invoked by uid 500); 30 Apr 2008 04:43:58 -0000
Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@harmony.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@harmony.apache.org>
List-Post: <mailto:commits@harmony.apache.org>
List-Id: <commits.harmony.apache.org>
Reply-To: dev@harmony.apache.org
Delivered-To: mailing list commits@harmony.apache.org
Received: (qmail 11428 invoked by uid 99); 30 Apr 2008 04:43:58 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Apr 2008 21:43:58 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Apr 2008 04:43:22 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id B6CBE23889FA; Tue, 29 Apr 2008 21:43:33 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r652257 - in
 /harmony/enhanced/buildtest/trunk/infra/adaptors:
 classlib-test/adaptor.xml classlib-test/parameters.xml
 snapshot/framework.local.properties
Date: Wed, 30 Apr 2008 04:43:33 -0000
To: commits@harmony.apache.org
From: smishura@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080430044333.B6CBE23889FA@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: smishura
Date: Tue Apr 29 21:43:33 2008
New Revision: 652257

URL: http://svn.apache.org/viewvc?rev=652257&view=rev
Log:
Update class-test adaptors to use flashed svn properties
(Also I've restored copying report files for results dir)

Modified:
    harmony/enhanced/buildtest/trunk/infra/adaptors/classlib-test/adaptor.xml
    harmony/enhanced/buildtest/trunk/infra/adaptors/classlib-test/parameters.xml
    harmony/enhanced/buildtest/trunk/infra/adaptors/snapshot/framework.local.properties

Modified: harmony/enhanced/buildtest/trunk/infra/adaptors/classlib-test/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/adaptors/classlib-test/adaptor.xml?rev=652257&r1=652256&r2=652257&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/adaptors/classlib-test/adaptor.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/adaptors/classlib-test/adaptor.xml Tue Apr 29 21:43:33 2008
@@ -33,6 +33,12 @@
 
     <!-- do run -->
     <target name="run" depends="-update-classlib-ws">
+
+        <!-- time of the current test run -->
+        <tstamp>
+            <format property="classlib-test.run.time" pattern="yyyyMMdd_HHmm" />
+        </tstamp>
+
         <!-- remove old results (they have been archived after the run) -->
         <delete quiet="true" verbose="false">
             <fileset dir="${classlib-test.results.dir}" includes="**/*" />
@@ -42,21 +48,21 @@
         <!-- to remove previous results                 -->
         <ant antfile="make/build-test.xml"
              target="clean"
-             dir="${classlib-test.parameters.required.trunk.dir}"
+             dir="${classlib-test.parameters.svn.classlib.location}"
              inheritAll="false" />
 
         <ant target="fetch-depends"
-             dir="${classlib-test.parameters.required.trunk.dir}"
+             dir="${classlib-test.parameters.svn.classlib.location}"
              inheritAll="false" />
 
-        <exec-ant dir="${classlib-test.parameters.required.trunk.dir}"
+        <exec-ant dir="${classlib-test.parameters.svn.classlib.location}"
                   targets="rebuild">
             <sysproperty key="keep.working" value="true" />
             <!-- workaround on classlib-build's InvocationTargetException -->
             <jvmarg line="-Xmx1000M" />
         </exec-ant>
 
-        <exec-ant dir="${classlib-test.trunk.dir}"
+        <exec-ant dir="${classlib-test.parameters.svn.classlib.location}"
                   targets="test"
                   failonerror="false"
                   failproperty="classlib-test.run.failed">
@@ -68,6 +74,20 @@
             <sysproperty key="exclude.module" value="awt,swing" />
         </exec-ant>
 
+        <!-- define the resulting files -->
+        <fileset id="classlib-test.results.set"
+                 dir="${classlib-test.parameters.svn.classlib.location}/build/test_report"
+                 includes="TEST-*.xml">
+            <date datetime="${classlib-test.run.time}"
+                  pattern="yyyyMMdd_HHmm"
+                  when="after" />
+        </fileset>
+
+        <copy todir="${classlib-test.results.dir}">
+            <fileset refid="classlib-test.results.set" />
+            <packagemapper from="*" to="*" />
+        </copy>
+
         <fail message="There were CLASSLIB Unit Test failures."
               if="classlib-test.run.failed" />
     </target>
@@ -85,12 +105,10 @@
             if="is.snapshot"
             description="adjusts classlib-tests to snapshots revision">
 
-        <loadproperties srcFile="${snapshot.svn.revision.file}" />
         <exec executable="svn"
-              dir="${classlib-test.trunk.dir}"
+              dir="${classlib-test.parameters.svn.classlib.location}"
               failonerror="true">
-            <arg line="-r${svn.revision}" />
-            <arg line="update" />
+            <arg line="up -r${svn.revision} ." />
         </exec>
     </target>
 

Modified: harmony/enhanced/buildtest/trunk/infra/adaptors/classlib-test/parameters.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/adaptors/classlib-test/parameters.xml?rev=652257&r1=652256&r2=652257&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/adaptors/classlib-test/parameters.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/adaptors/classlib-test/parameters.xml Tue Apr 29 21:43:33 2008
@@ -22,9 +22,6 @@
         <tested.jre
             description="Path to JRE under test"
             value="${drlvm.parameters.shared.jre.dir}"/>
-        <trunk.dir
-            description="Path to CLASSLIB trunk directory"
-            value="${classlib.parameters.shared.trunk.dir}"/>
     </required>
 
     <optional>

Modified: harmony/enhanced/buildtest/trunk/infra/adaptors/snapshot/framework.local.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/adaptors/snapshot/framework.local.properties?rev=652257&r1=652256&r2=652257&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/adaptors/snapshot/framework.local.properties (original)
+++ harmony/enhanced/buildtest/trunk/infra/adaptors/snapshot/framework.local.properties Tue Apr 29 21:43:33 2008
@@ -13,10 +13,6 @@
 classlib-test.parameters.required.tested.jre=${snapshot.parameters.shared.jre}
 classlib-test.parameters.cc.config=${adaptors.dir}/snapshot/suite-cc-custom-config.xml
 
-classlib-test.parameters.required.trunk.url=http://svn.apache.org/repos/asf/harmony/enhanced/classlib/trunk
-classlib-test.trunk.dir=${checkouts.dir}/classlib
-classlib-test.parameters.required.trunk.dir=${classlib-test.trunk.dir}
-
 #
 dacapo.parameters.depends=snapshot
 dacapo.parameters.required.jdk.to.test.home=${snapshot.parameters.shared.jre}