Browse Source

HADOOP-715. Fix build.xml so that test logs are written in the build directory, rather than in PWD. Contributed by Arun.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@475014 13f79535-47bb-0310-9956-ffa450edef68
Doug Cutting 18 years ago
parent
commit
ea7c70df82
2 changed files with 7 additions and 5 deletions
  1. 3 0
      CHANGES.txt
  2. 4 5
      build.xml

+ 3 - 0
CHANGES.txt

@@ -73,6 +73,9 @@ Trunk (unreleased changes)
 22. HADOOP-668.  Improvements to the web-based DFS browser.
 22. HADOOP-668.  Improvements to the web-based DFS browser.
     (Hairong Kuang via cutting)
     (Hairong Kuang via cutting)
 
 
+23. HADOOP-715.  Fix build.xml so that test logs are written in build
+    directory, rather than in CWD.  (Arun C Murthy via cutting)
+
 
 
 Release 0.8.0 - 2006-11-03
 Release 0.8.0 - 2006-11-03
 
 

+ 4 - 5
build.xml

@@ -36,7 +36,7 @@
   <property name="test.build.dir" value="${build.dir}/test"/>
   <property name="test.build.dir" value="${build.dir}/test"/>
   <property name="test.build.data" value="${test.build.dir}/data"/>
   <property name="test.build.data" value="${test.build.dir}/data"/>
   <property name="test.cache.data" value="${test.build.dir}/cache"/>
   <property name="test.cache.data" value="${test.build.dir}/cache"/>
-  <property name="hadoop.log.dir" value="${test.build.dir}/logs"/>
+  <property name="test.log.dir" value="${test.build.dir}/logs"/>
   <property name="test.build.classes" value="${test.build.dir}/classes"/>
   <property name="test.build.classes" value="${test.build.dir}/classes"/>
   <property name="test.build.testjar" value="${test.build.dir}/testjar"/>
   <property name="test.build.testjar" value="${test.build.dir}/testjar"/>
   <property name="test.build.javadoc" value="${test.build.dir}/docs/api"/>
   <property name="test.build.javadoc" value="${test.build.dir}/docs/api"/>
@@ -320,15 +320,14 @@
 
 
     <delete dir="${test.build.data}"/>
     <delete dir="${test.build.data}"/>
     <mkdir dir="${test.build.data}"/>
     <mkdir dir="${test.build.data}"/>
-    <delete dir="${hadoop.log.dir}"/>
-    <mkdir dir="${hadoop.log.dir}"/>
+    <delete dir="${test.log.dir}"/>
+    <mkdir dir="${test.log.dir}"/>
     <junit showoutput="${test.output}" printsummary="yes" haltonfailure="no" 
     <junit showoutput="${test.output}" printsummary="yes" haltonfailure="no" 
            fork="yes" dir="${basedir}"
            fork="yes" dir="${basedir}"
       errorProperty="tests.failed" failureProperty="tests.failed">
       errorProperty="tests.failed" failureProperty="tests.failed">
       <sysproperty key="test.build.data" value="${test.build.data}"/>
       <sysproperty key="test.build.data" value="${test.build.data}"/>
-      <sysproperty key="hadoop.log.dir" value="${hadoop.log.dir}"/>
+      <sysproperty key="hadoop.log.dir" value="${test.log.dir}"/>
       <sysproperty key="test.src.dir" value="${test.src.dir}"/>
       <sysproperty key="test.src.dir" value="${test.src.dir}"/>
-      <sysproperty key="hadoop.log.dir" value="."/>
       <classpath refid="${test.classpath.id}"/>
       <classpath refid="${test.classpath.id}"/>
       <formatter type="${test.junit.output.format}" />
       <formatter type="${test.junit.output.format}" />
       <batchtest todir="${test.build.dir}" unless="testcase">
       <batchtest todir="${test.build.dir}" unless="testcase">