hadoop-hdfs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject svn commit: r1006057 - in /hadoop/hdfs/trunk: CHANGES.txt build.xml
Date Fri, 08 Oct 2010 22:42:49 GMT
Author: cos
Date: Fri Oct  8 22:42:49 2010
New Revision: 1006057

URL: http://svn.apache.org/viewvc?rev=1006057&view=rev
Log:
HDFS-1444. Test related code of build.xml is error-prone and needs to be re-aligned. Contributed
by Konstantin Boudnik.

Modified:
    hadoop/hdfs/trunk/CHANGES.txt
    hadoop/hdfs/trunk/build.xml

Modified: hadoop/hdfs/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=1006057&r1=1006056&r2=1006057&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Fri Oct  8 22:42:49 2010
@@ -307,6 +307,9 @@ Release 0.21.1 - Unreleased
 
     HDFS-1420. Clover build doesn't generate per-test coverage (cos)
 
+    HDFS-1444. Test related code of build.xml is error-prone and needs to be
+    re-aligned. (cos)
+
 Release 0.21.0 - 2010-08-13
 
   INCOMPATIBLE CHANGES

Modified: hadoop/hdfs/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/build.xml?rev=1006057&r1=1006056&r2=1006057&view=diff
==============================================================================
--- hadoop/hdfs/trunk/build.xml (original)
+++ hadoop/hdfs/trunk/build.xml Fri Oct  8 22:42:49 2010
@@ -82,7 +82,6 @@
   <property name="test.cache.data" value="${test.build.dir}/cache"/>
   <property name="test.debug.data" value="${test.build.dir}/debug"/>
   <property name="test.log.dir" value="${test.build.dir}/logs"/>
-  <property name="test.build.classes" value="${test.build.dir}/classes"/>
   <property name="test.build.extraconf" value="${test.build.dir}/extraconf"/>
   <property name="test.build.javadoc" value="${test.build.dir}/docs/api"/>
   <property name="test.build.javadoc.dev" value="${test.build.dir}/docs/dev-api"/>
@@ -96,7 +95,7 @@
   <property name="test.junit.haltonfailure" value="no" />
   <property name="test.junit.maxmemory" value="512m" />
 
-  <property name="test.hdfs.build.classes" value="${test.build.dir}/classes"/>
+  <property name="test.hdfs.build.classes" value="${test.build.dir}/hdfs/classes"/>
 
   <property name="test.hdfs.commit.tests.file" value="${test.src.dir}/commit-tests" />
   <property name="test.hdfs.smoke.tests.file" value="${test.src.dir}/smoke-tests" />
@@ -220,7 +219,7 @@
   <!-- the cluster test classpath: uses conf.dir for configuration -->
   <path id="test.cluster.classpath">
     <path refid="classpath"/>
-    <pathelement location="${test.build.classes}" />
+    <pathelement location="${test.hdfs.build.classes}" />
     <pathelement location="${test.src.dir}"/>
     <pathelement location="${build.dir}"/>
   </path>
@@ -254,7 +253,7 @@
     <mkdir dir="${build.dir}/c++"/>
     
     <mkdir dir="${test.build.dir}"/>
-    <mkdir dir="${test.build.classes}"/>
+    <mkdir dir="${test.hdfs.build.classes}"/>
     <mkdir dir="${test.build.extraconf}"/>
     <tempfile property="touch.temp.file" destDir="${java.io.tmpdir}"/>
     <touch millis="0" file="${touch.temp.file}">
@@ -432,9 +431,6 @@
   <target name="jar-test" depends="jar-hdfs-test" description="Make hadoop-test.jar"/>

 
   <target name="jar-hdfs-test" depends="compile-hdfs-test" description="Make hadoop-hdfs-test.jar">
-    <copy todir="${test.build.classes}">
-      <fileset dir="${test.hdfs.build.classes}"/>
-    </copy>
     <subant buildpath="build.xml" target="-do-jar-test">
     </subant>
     <jar jarfile="${hadoop-hdfs-test-sources.jar}">
@@ -445,7 +441,7 @@
 
   <target name="-do-jar-test">
     <jar jarfile="${build.dir}/${test.hdfs.final.name}.jar"
-         basedir="${test.build.classes}">
+         basedir="${test.hdfs.build.classes}">
          <manifest>
            <attribute name="Main-Class"
                       value="org/apache/hadoop/test/HdfsTestDriver"/>



Mime
View raw message