hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
Subject svn commit: r1077433 - /hadoop/common/branches/branch-0.20-security-patches/build.xml
Date Fri, 04 Mar 2011 04:14:22 GMT
Author: omalley
Date: Fri Mar  4 04:14:22 2011
New Revision: 1077433

URL: http://svn.apache.org/viewvc?rev=1077433&view=rev
Log:
commit 6154ec4740ab49af85499299dd54dfa485a8a8d4
Author: Konstantin Boudnik <cos@goodenter-lm.local>
Date:   Wed Apr 28 18:37:44 2010 -0700

    HADOOP:6526 from https://issues.apache.org/jira/secure/attachment/12442917/3595485.patch
    
    +++ b/YAHOO-CHANGES.txt
    +    HADOOP-6526. Additional fix for test context on top of existing one. (cos)
    +

Modified:
    hadoop/common/branches/branch-0.20-security-patches/build.xml

Modified: hadoop/common/branches/branch-0.20-security-patches/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/build.xml?rev=1077433&r1=1077432&r2=1077433&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/build.xml (original)
+++ hadoop/common/branches/branch-0.20-security-patches/build.xml Fri Mar  4 04:14:22 2011
@@ -861,6 +861,14 @@
   <!-- Define a macro that will be used for fast and all test runs -->
   <macrodef name="macro-test-runner">
     <attribute name="test.file" />
+    <attribute name="classpath" />
+    <attribute name="test.dir" />
+    <attribute name="fileset.dir" />
+    <attribute name="hadoop.home" default="" />
+    <attribute name="hadoop.conf.dir" default="" />
+    <attribute name="hadoop.conf.dir.deployed" default="" />
+    <attribute name="test.krb5.conf" default="" />
+    <attribute name="test.krb5.conf.filename" default="" />
     <sequential>
       <delete file="${test.build.dir}/testsfailed"/>
       <delete dir="${test.build.data}"/>
@@ -892,8 +900,8 @@
         <sysproperty key="taskcontroller-ugi" value="${taskcontroller-ugi}" />
         <sysproperty key="test.build.extraconf"
                      value="@{test.dir}/extraconf" />
-        <sysproperty key="java.security.krb5.conf"
-                     value="${test.src.dir}/krb5.conf"/>
+        <sysproperty key="@{test.krb5.conf}"
+                     value="@{test.krb5.conf.filename}"/>
         <sysproperty key="hadoop.policy.file" value="hadoop-policy.xml" />
         <sysproperty key="java.library.path"
           value="${build.native}/lib:${lib.dir}/native/${build.platform}"/>
@@ -941,13 +949,27 @@
     </sequential>
   </macrodef>
 
-  <target name="test-core" depends="jar-test" description="Run core unit tests"> 
-    <macro-test-runner test.file="${test.all.tests.file}" />
-  </target>
-         
+  <target name="test-core" depends="jar-test" description="Run core unit tests">
+    <macro-test-runner test.file="${test.all.tests.file}"
+                       classpath="${test.classpath.id}"
+                       test.dir="${test.build.dir}"
+                       fileset.dir="${test.src.dir}"
+                       test.krb5.conf="java.security.krb5.conf"
+                       test.krb5.conf.filename="${test.src.dir}/krb5.conf"
+                       >
+    </macro-test-runner>
+  </target>   
+
   <target name="test-commit" depends="jar-test" 
-   description="Run approx 10-minute set of unit tests prior to commiting">
-    <macro-test-runner test.file="${test.commit.tests.file}" />
+    description="Run approx 10-minute set of unit tests prior to commiting">
+    <macro-test-runner test.file="${test.commit.tests.file}"
+                       classpath="${test.classpath.id}"
+                       test.dir="${test.build.dir}"
+                       fileset.dir="${test.src.dir}"
+                       test.krb5.conf="java.security.krb5.conf"
+                       test.krb5.conf.filename="${test.src.dir}/krb5.conf"
+                       >
+    </macro-test-runner>
   </target>
   
   <target name="checkfailure" if="tests.failed">



Mime
View raw message