svn commit: r1204439 - in /lucene/dev/trunk: ./ lucene/ lucene/build.xml

[us...@apache.org]

Author: uschindler
Date: Mon Nov 21 10:37:21 2011
New Revision: 1204439

URL: http://svn.apache.org/viewvc?rev=1204439&view=rev
Log:
merge the backwards changes to trunk (currently unused, but we will need those later)

Modified:
    lucene/dev/trunk/   (props changed)
    lucene/dev/trunk/lucene/   (props changed)
    lucene/dev/trunk/lucene/build.xml

Modified: lucene/dev/trunk/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/build.xml?rev=1204439&r1=1204438&r2=1204439&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/build.xml (original)
+++ lucene/dev/trunk/lucene/build.xml Mon Nov 21 10:37:21 2011
@@ -86,8 +86,16 @@
   	description="Runs tests of a previous Lucene version.">
 	<sequential>
       <mkdir dir="${build.dir.backwards}"/>	  
-          
+      
+      <!-- TODO: separate test-framework from core tests (because META-INF duplicates in trunk) -->
+      
       <!-- compile branch tests against previous version JAR file -->	
+      <compile-test-macro srcdir="${backwards.dir}/src/test-framework/java" destdir="${build.dir.backwards}/classes/test"
+                  test.classpath="backwards.test.compile.classpath" javac.source="${javac.source.backwards}" javac.target="${javac.target.backwards}"/>
+      <!-- Copy the resources folder (if existent) -->
+      <copy todir="${build.dir.backwards}/classes/test">
+        <fileset dir="${backwards.dir}/src/test-framework/resources" erroronmissingdir="no"/>
+      </copy>
       <compile-test-macro srcdir="${backwards.dir}/src/test" destdir="${build.dir.backwards}/classes/test"
                   test.classpath="backwards.test.compile.classpath" javac.source="${javac.source.backwards}" javac.target="${javac.target.backwards}"/>