From commits-return-46195-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org Fri Nov 02 10:11:03 2007
Return-Path: <commits-return-46195-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 19987 invoked from network); 2 Nov 2007 10:11:03 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 2 Nov 2007 10:11:03 -0000
Received: (qmail 99856 invoked by uid 500); 2 Nov 2007 10:10:51 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 99770 invoked by uid 500); 2 Nov 2007 10:10:51 -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 99761 invoked by uid 99); 2 Nov 2007 10:10:50 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Nov 2007 03:10:50 -0700
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Nov 2007 10:11:20 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 82CF41A9832; Fri,  2 Nov 2007 03:10:39 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r591289 -
 /harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml
Date: Fri, 02 Nov 2007 10:10:39 -0000
To: commits@harmony.apache.org
From: varlax@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071102101039.82CF41A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: varlax
Date: Fri Nov  2 03:10:38 2007
New Revision: 591289

URL: http://svn.apache.org/viewvc?rev=591289&view=rev
Log:
Minor enhancement to regtesting framework: do not require custom launcher for JUnit test with JNI usage.

Modified:
    harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml?rev=591289&r1=591288&r2=591289&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml Fri Nov  2 03:10:38 2007
@@ -41,7 +41,7 @@
              to specify particular tests to execute -->
         <property name="test.case" value="H*"/>
 
-        <for param="reg.test.2launch.src.dir">
+        <for param="reg.test.2launch">
             <!-- Go through directories containing regression tests -->
             <dirset dir="${reg.test.src}" includes="${test.case}">
                 <excludesfile name="${exclude.list}" if="exclude.list"/>
@@ -50,23 +50,27 @@
                 <!-- Set up the property pointing to the natives path -->
                 <var name="reg.test.2launch.native.path" unset="true"/>
                 <pathconvert property="reg.test.2launch.native.path">
-                    <path path="@{reg.test.2launch.src.dir}"/>
+                    <path path="@{reg.test.2launch}"/>
                     <map from="${reg.test.src}" to="${reg.test.native.path}"/>
                 </pathconvert>
                 <if>
-                    <available file="@{reg.test.2launch.src.dir}/run.test.xml"/>
+                    <available file="@{reg.test.2launch}/run.test.xml"/>
                     <then>
                         <!-- Launch the tests with a custom launchers 
                                                 placed near the tests -->
-                        <ant antfile="@{reg.test.2launch.src.dir}/run.test.xml" 
+                        <ant antfile="@{reg.test.2launch}/run.test.xml" 
                             target="run-test" 
                             inheritAll="true" inheritRefs="true"/>
                     </then>
                     <else>
-                        <!-- Execution of unit tests checking for regression -->
+                        <!-- Run standard JUnit tests -->
+                        <condition property="@{reg.test.2launch}.extra.arg" else=""
+                            value="-Djava.library.path=${reg.test.2launch.native.path}">
+                            <available file="${reg.test.2launch.native.path}"/>
+                        </condition>
                         <for param="reg.unit.test.src">
                             <!-- Go through unit tests in the directory -->
-                            <fileset dir="@{reg.test.2launch.src.dir}">
+                            <fileset dir="@{reg.test.2launch}">
                                 <include name="*Test.java"/>
                                 <include name="*Test.j"/>
                             </fileset>
@@ -76,7 +80,8 @@
                                   input="@{reg.unit.test.src}"
                                   regexp=".*H(\d\d*)[/\\](..*)\.j.*" 
                                   replace="${reg.test.package}.h\1.\2"/>
-                                <run-junit-test test="${unit.test.class}"/>
+                                <run-junit-test test="${unit.test.class}"
+                                    vmarg="${@{reg.test.2launch}.extra.arg}"/>
                             </sequential>
                         </for>
                     </else>