Return-Path: 
 <java-dev-return-10096-apmail-lucene-java-dev-archive=lucene.apache.org@lucene.apache.org>
Delivered-To: apmail-lucene-java-dev-archive@www.apache.org
Received: (qmail 50408 invoked from network); 11 May 2005 18:06:22 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 11 May 2005 18:06:22 -0000
Received: (qmail 68264 invoked by uid 500); 11 May 2005 18:10:01 -0000
Delivered-To: apmail-lucene-java-dev-archive@lucene.apache.org
Received: (qmail 68215 invoked by uid 500); 11 May 2005 18:10:00 -0000
Mailing-List: contact java-dev-help@lucene.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:java-dev-help@lucene.apache.org>
List-Unsubscribe: <mailto:java-dev-unsubscribe@lucene.apache.org>
List-Post: <mailto:java-dev@lucene.apache.org>
List-Id: <java-dev.lucene.apache.org>
Reply-To: java-dev@lucene.apache.org
Delivered-To: mailing list java-dev@lucene.apache.org
Received: (qmail 68199 invoked by uid 99); 11 May 2005 18:09:59 -0000
X-ASF-Spam-Status: No, hits=0.0 required=10.0
	tests=
X-Spam-Check-By: apache.org
Received-SPF: neutral (hermes.apache.org: local policy)
Received: from rwcrmhc14.comcast.net (HELO rwcrmhc14.comcast.net)
 (216.148.227.89)
  by apache.org (qpsmtpd/0.28) with ESMTP; Wed, 11 May 2005 11:09:59 -0700
Received: from [192.168.168.81]
 (c-24-5-160-217.hsd1.ca.comcast.net[24.5.160.217])
          by comcast.net (rwcrmhc14) with ESMTP
          id <2005051118061001400eh0gne>; Wed, 11 May 2005 18:06:10 +0000
Message-ID: <42824991.1060202@apache.org>
Date: Wed, 11 May 2005 11:06:09 -0700
From: Doug Cutting <cutting@apache.org>
User-Agent: Mozilla Thunderbird 1.0.2-1.3.2 (X11/20050324)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: java-dev@lucene.apache.org
Subject: patch to build.xml
Content-Type: multipart/mixed;
 boundary="------------060108080401090509090504"
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

--------------060108080401090509090504
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Attached is a patch to build.xml and common-build.xml that makes 'ant 
test' succeed.  The problem is that, classically, unit tests in Lucene 
are named Test*.java, but there are tests in contrib named *Test.java, 
and there are non-unit tests in src/test named *Test.java.  Until this 
is resolved, we need two patterns to identify unit tests, one for 
src/test and one for contrib/.

Doug

--------------060108080401090509090504
Content-Type: text/x-patch;
 name="build.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="build.patch"

Index: build.xml
===================================================================
--- build.xml	(revision 169506)
+++ build.xml	(working copy)
@@ -2,6 +2,7 @@
 
 <project name="core" default="default" basedir=".">
 
+  <property name="junit.includes" value="**/Test*.java"/>
 
   <import file="common-build.xml"/>
 
@@ -393,6 +394,10 @@
     <contrib-crawl/>
   </target>
 
+  <target name="test-contrib" depends="compile-test">
+    <contrib-crawl target="test"/>
+  </target>
+
   <macrodef name="invoke-javadoc">
     <attribute name="access"/>
     <attribute name="destdir"/>
Index: common-build.xml
===================================================================
--- common-build.xml	(revision 169506)
+++ common-build.xml	(working copy)
@@ -41,8 +41,8 @@
 
   <property name="junit.output.dir" location="${build.dir}/test"/>
   <property name="junit.reports" location="${build.dir}/test/reports"/>
+  <property name="junit.includes" value="**/Test*.java,**/*Test.java"/>
 
-
   <available
     property="javacc.present"
     classname="org.javacc.parser.Main"
@@ -178,8 +178,7 @@
       <formatter type="xml"/>
       <formatter type="brief" usefile="false"/>
       <batchtest fork="yes" todir="${junit.output.dir}" unless="testcase">
-        <fileset dir="src/test" includes="**/Test*.java"/>
-        <fileset dir="src/test" includes="**/*Test.java"/>
+        <fileset dir="src/test" includes="${junit.includes}"/>
       </batchtest>
       <batchtest fork="yes" todir="${junit.output.dir}" if="testcase">
         <fileset dir="src/test" includes="**/${testcase}.java"/>


--------------060108080401090509090504
Content-Type: text/plain; charset=us-ascii

---------------------------------------------------------------------
To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: java-dev-help@lucene.apache.org
--------------060108080401090509090504--