Forráskód Böngészése

HADOOP-2690. Add jar-test target to build.xml, separating compilation
and packaging of the test classes. Contributed by Enis Soztutar.



git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@619672 13f79535-47bb-0310-9956-ffa450edef68

Christopher Douglas 17 éve
szülő
commit
4cbfb9cc0b
2 módosított fájl, 26 hozzáadás és 10 törlés
  1. 4 1
      CHANGES.txt
  2. 22 9
      build.xml

+ 4 - 1
CHANGES.txt

@@ -363,7 +363,10 @@ Release 0.16.0 - 2008-02-07
     local-file versus hdfs reads. (Owen O'Malley via nigel)
 
     HADOOP-2529. First version of HDFS User Guide. (Raghu Angadi)
-    
+
+    HADOOP-2690. Add jar-test target to build.xml, separating compilation
+    and packaging of the test classes. (Enis Soztutar via cdouglas)
+
   OPTIMIZATIONS
 
     HADOOP-1898.  Release the lock protecting the last time of the last stack

+ 22 - 9
build.xml

@@ -492,13 +492,6 @@
      basedir="${test.build.testjar}">
     </jar>
                                                               
-    <jar jarfile="${build.dir}/${final.name}-test.jar"
-         basedir="${test.build.classes}">
-         <manifest>
-           <attribute name="Main-Class"
-                      value="org/apache/hadoop/test/AllTestDriver"/>
-         </manifest>
-    </jar>
     <delete dir="${test.cache.data}"/>
     <mkdir dir="${test.cache.data}"/>
     <delete dir="${test.debug.data}"/>
@@ -511,10 +504,30 @@
     <copy file="${test.src.dir}/org/apache/hadoop/dfs/hadoop-12-dfs-dir.txt" todir="${test.cache.data}"/>
   </target>
 
+  <!-- ================================================================== -->
+  <!-- Make hadoop-test.jar                                               -->
+  <!-- ================================================================== -->
+  <!--                                                                    -->
+  <!-- ================================================================== -->
+  <target name="jar-test" depends="compile-core-test" description="Make hadoop-test.jar">
+    <jar jarfile="${build.dir}/${final.name}-test.jar"
+         basedir="${test.build.classes}">
+         <manifest>
+           <attribute name="Main-Class"
+                      value="org/apache/hadoop/test/AllTestDriver"/>
+          <section name="org/apache/hadoop">
+            <attribute name="Implementation-Title" value="Hadoop"/>
+            <attribute name="Implementation-Version" value="${version}"/>
+            <attribute name="Implementation-Vendor" value="Apache"/>
+          </section>
+         </manifest>
+    </jar>
+  </target>
+
   <!-- ================================================================== -->
   <!-- Run unit tests                                                     --> 
   <!-- ================================================================== -->
-  <target name="test-core" depends="compile-core-test" description="Run core unit tests">
+  <target name="test-core" depends="jar-test" description="Run core unit tests">
 
     <delete dir="${test.build.data}"/>
     <mkdir dir="${test.build.data}"/>
@@ -702,7 +715,7 @@
   <!-- ================================================================== -->
   <!--                                                                    -->
   <!-- ================================================================== -->
-  <target name="package" depends="jar, javadoc, examples, compile-core-test, ant-tasks" description="Build distribution">
+  <target name="package" depends="jar, javadoc, examples, jar-test, ant-tasks" description="Build distribution">
     <mkdir dir="${dist.dir}"/>
     <mkdir dir="${dist.dir}/lib"/>
     <mkdir dir="${dist.dir}/contrib"/>