Author: yanz
Date: Tue Jun 15 19:59:51 2010
New Revision: 955029

URL: http://svn.apache.org/viewvc?rev=955029&view=rev
Log:
PIG-1451 Change the build.test property in build to test.build.dir to be 
consistent with PIG (yanz)

Modified:
    hadoop/pig/branches/branch-0.7/contrib/zebra/CHANGES.txt
    hadoop/pig/branches/branch-0.7/contrib/zebra/build-contrib.xml
    hadoop/pig/branches/branch-0.7/contrib/zebra/build.xml

Modified: hadoop/pig/branches/branch-0.7/contrib/zebra/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/pig/branches/branch-0.7/contrib/zebra/CHANGES.txt?rev=955029&r1=955028&r2=955029&view=diff
==============================================================================
--- hadoop/pig/branches/branch-0.7/contrib/zebra/CHANGES.txt (original)
+++ hadoop/pig/branches/branch-0.7/contrib/zebra/CHANGES.txt Tue Jun 15 
19:59:51 2010
@@ -4,6 +4,8 @@ Trunk (unreleased changes)
 
   INCOMPATIBLE CHANGES
 
+    PIG-1451 Change the build.test property in build to test.build.dir to be 
consistent with PIG (yanz)
+
     PIG-1444 Addition of test-smoke ant target (gauravj via yanz)
 
     PIG-1357 Addition of Test cases of map-side GROUP-BY (yanz)

Modified: hadoop/pig/branches/branch-0.7/contrib/zebra/build-contrib.xml
URL: 
http://svn.apache.org/viewvc/hadoop/pig/branches/branch-0.7/contrib/zebra/build-contrib.xml?rev=955029&r1=955028&r2=955029&view=diff
==============================================================================
--- hadoop/pig/branches/branch-0.7/contrib/zebra/build-contrib.xml (original)
+++ hadoop/pig/branches/branch-0.7/contrib/zebra/build-contrib.xml Tue Jun 15 
19:59:51 2010
@@ -49,9 +49,9 @@
   <property name="build.javadoc"
          location="${pig.root}/build/contrib/${name}/docs"/>
   <property name="build.classes" location="${build.dir}/classes"/>
-  <property name="build.test" location="${build.dir}/test"/>
+  <property name="test.build.dir" location="${build.dir}/test"/>
   <property name="build.examples" location="${build.dir}/examples"/>
-  <property name="pig.log.dir" location="${build.dir}/test/logs"/>
+  <property name="pig.log.dir" location="${test.build.dir}/logs"/>
   <property name="hadoop.jarfile" value="hadoop20.jar" />
   <property name="pig.jarfile" value="pig-0.7.0-dev-core.jar" />
   <property name="hbase.jarfile" value="hbase-0.18.1.jar" />
@@ -62,8 +62,8 @@
   <property name="build.ivy.lib.dir" location="${build.ivy.dir}/lib" />
   <property name="ivy.lib.dir" location="${build.ivy.lib.dir}/Pig"/>
 
-  <property name="clover.db.dir" location="${build.dir}/test/clover/db"/>
-    <property name="clover.report.dir" 
location="${build.dir}/test/clover/reports"/>
+  <property name="clover.db.dir" location="${test.build.dir}/clover/db"/>
+    <property name="clover.report.dir" 
location="${test.build.dir}/clover/reports"/>
     <property name="clover.jar" location="${clover.home}/lib/clover.jar"/>
     <available property="clover.present" file="${clover.jar}" />
     <!-- check if clover reports should be generated -->
@@ -117,7 +117,7 @@
 
   <!-- the unit test classpath -->
   <path id="test.classpath">
-    <pathelement location="${build.test}" />
+    <pathelement location="${test.build.dir}" />
     <pathelement location="${pig.root}/build/test/classes"/>
     <pathelement location="${pig.root}/src/contrib/test"/>
     <pathelement location="${conf.dir}"/>
@@ -140,7 +140,7 @@
     <mkdir dir="${src.gen.zebra.parser.dir}"/>
     <mkdir dir="${build.dir}"/>
     <mkdir dir="${build.classes}"/>
-    <mkdir dir="${build.test}"/>
+    <mkdir dir="${test.build.dir}"/>
     <mkdir dir="${build.examples}"/>
     <mkdir dir="${pig.log.dir}"/>
     <antcall target="init-contrib"/>
@@ -208,7 +208,7 @@
      encoding="${build.encoding}"
      srcdir="${src.test}"
      includes="**/*.java"
-     destdir="${build.test}"
+     destdir="${test.build.dir}"
      debug="${javac.debug}">
       <classpath refid="test.classpath"/>
     </javac>

Modified: hadoop/pig/branches/branch-0.7/contrib/zebra/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/pig/branches/branch-0.7/contrib/zebra/build.xml?rev=955029&r1=955028&r2=955029&view=diff
==============================================================================
--- hadoop/pig/branches/branch-0.7/contrib/zebra/build.xml (original)
+++ hadoop/pig/branches/branch-0.7/contrib/zebra/build.xml Tue Jun 15 19:59:51 
2010
@@ -124,7 +124,7 @@ to call at top-level: ant deploy-contrib
   <target name="jar-test" depends="jar, compile-test">
     <jar
       jarfile="${build.dir}/pig-${version}-${name}-test.jar"
-      basedir="${build.test}"      
+      basedir="${test.build.dir}"      
     >
     </jar>
   </target>
@@ -136,16 +136,16 @@ to call at top-level: ant deploy-contrib
     <echo message="contrib: ${name}"/>
     <delete dir="${pig.log.dir}"/>
     <mkdir dir="${pig.log.dir}"/>
-    <delete dir="${build.test}/data"/>
-    <mkdir dir="${build.test}/data"/>
+    <delete dir="${test.build.dir}/data"/>
+    <mkdir dir="${test.build.dir}/data"/>
     <junit
       printsummary="yes" showoutput="${test.output}" 
       haltonfailure="no" fork="yes" maxmemory="1024m"
       errorProperty="tests.failed" failureProperty="tests.failed"
       timeout="${test.timeout}">
       
-      <sysproperty key="test.build.data" value="${build.test}/data"/>
-      <sysproperty key="build.test" value="${build.test}"/>
+      <sysproperty key="test.build.data" value="${test.build.dir}/data"/>
+      <sysproperty key="test.build.dir" value="${test.build.dir}"/>
       <sysproperty key="contrib.name" value="${name}"/>
       <sysproperty key="hadoop.log.dir" value="${pig.log.dir}"/>
        <sysproperty key="whichCluster" value="miniCluster"/>
@@ -154,7 +154,7 @@ to call at top-level: ant deploy-contrib
         relative File paths to use the specified user.dir 
         classpath to use build/contrib/*.jar
       -->
-      <sysproperty key="user.dir" value="${build.test}/data"/>
+      <sysproperty key="user.dir" value="${test.build.dir}/data"/>
       
       <sysproperty key="fs.default.name" value="${fs.default.name}"/>
       <sysproperty key="pig.test.localoutputfile" 
value="${pig.test.localoutputfile}"/>
@@ -162,11 +162,11 @@ to call at top-level: ant deploy-contrib
       <classpath refid="test.classpath"/>
       <formatter type="${test.junit.output.format}" />
 
-      <batchtest todir="${build.test}" unless="testcase">
+      <batchtest todir="${test.build.dir}" unless="testcase">
         <fileset dir="${src.test}"
                  includes="**/TestCheckin*.java" 
excludes="**/${test.exclude}.java" />
       </batchtest>
-      <batchtest todir="${build.test}"  if="testcase">
+      <batchtest todir="${test.build.dir}"  if="testcase">
         <fileset dir="${src.test}"
                  includes="**/${testcase}.java"/>
       </batchtest>
@@ -183,16 +183,16 @@ to call at top-level: ant deploy-contrib
     <echo message="contrib: ${name}"/>
     <delete dir="${pig.log.dir}"/>
     <mkdir dir="${pig.log.dir}"/>
-    <delete dir="${build.test}/data"/>
-    <mkdir dir="${build.test}/data"/>
+    <delete dir="${test.build.dir}/data"/>
+    <mkdir dir="${test.build.dir}/data"/>
     <junit
       printsummary="yes" showoutput="${test.output}"
       haltonfailure="no" fork="yes" maxmemory="1024m"
       errorProperty="tests.failed" failureProperty="tests.failed"
       timeout="${test.timeout}">
 
-      <sysproperty key="test.build.data" value="${build.test}/data"/>
-      <sysproperty key="build.test" value="${build.test}"/>
+      <sysproperty key="test.build.data" value="${test.build.dir}/data"/>
+      <sysproperty key="test.build.dir" value="${test.build.dir}"/>
       <sysproperty key="contrib.name" value="${name}"/>
       <sysproperty key="hadoop.log.dir" value="${pig.log.dir}"/>
        <sysproperty key="whichCluster" value="miniCluster"/>
@@ -201,7 +201,7 @@ to call at top-level: ant deploy-contrib
         relative File paths to use the specified user.dir
         classpath to use build/contrib/*.jar
       -->
-      <sysproperty key="user.dir" value="${build.test}/data"/>
+      <sysproperty key="user.dir" value="${test.build.dir}/data"/>
 
       <sysproperty key="fs.default.name" value="${fs.default.name}"/>
       <sysproperty key="pig.test.localoutputfile" 
value="${pig.test.localoutputfile}"/>
@@ -209,11 +209,11 @@ to call at top-level: ant deploy-contrib
       <classpath refid="test.classpath"/>
       <formatter type="${test.junit.output.format}" />
 
-      <batchtest todir="${build.test}" unless="testcase">
+      <batchtest todir="${test.build.dir}" unless="testcase">
         <fileset dir="${src.test}"
                  includes="**/TestMultipleOutputs.java, 
**/TestTableLoaderP*.java" excludes="**/${test.exclude}.java" />
       </batchtest>
-      <batchtest todir="${build.test}"  if="testcase">
+      <batchtest todir="${test.build.dir}"  if="testcase">
         <fileset dir="${src.test}"
                  includes="**/${testcase}.java"/>
       </batchtest>
@@ -237,8 +237,8 @@ to call at top-level: ant deploy-contrib
       errorProperty="tests.failed" failureProperty="tests.failed"
       timeout="${test.timeout}">
       
-      <sysproperty key="test.build.data" value="${build.test}/data"/>
-      <sysproperty key="build.test" value="${build.test}"/>
+      <sysproperty key="test.build.data" value="${test.build.dir}/data"/>
+      <sysproperty key="test.build.dir" value="${test.build.dir}"/>
       <sysproperty key="contrib.name" value="${name}"/>
       <sysproperty key="hadoop.log.dir" value="${pig.log.dir}"/>
       <sysproperty key="whichCluster" value="miniCluster"/>
@@ -246,7 +246,7 @@ to call at top-level: ant deploy-contrib
         relative File paths to use the specified user.dir 
         classpath to use build/contrib/*.jar
       -->
-      <sysproperty key="user.dir" value="${build.test}/data"/>
+      <sysproperty key="user.dir" value="${test.build.dir}/data"/>
       
       <sysproperty key="fs.default.name" value="${fs.default.name}"/>
       <sysproperty key="pig.test.localoutputfile" 
value="${pig.test.localoutputfile}"/>
@@ -255,7 +255,7 @@ to call at top-level: ant deploy-contrib
       <formatter type="${test.junit.output.format}" />
 
       <!-- For the time being, we disable two test cases that need a real 
cluster to run -->
-      <batchtest todir="${build.test}">
+      <batchtest todir="${test.build.dir}">
         <fileset dir="${src.test}" includes="**/Test*.java" 
excludes="**/TestCheckin*.java">
           <not>
             <filename name="**/TestSmoke*.java"/>
@@ -280,8 +280,8 @@ to call at top-level: ant deploy-contrib
              errorProperty="tests.failed" failureProperty="tests.failed"
              timeout="${test.timeout}">
              
-             <sysproperty key="test.build.data" value="${build.test}/data"/>
-             <sysproperty key="build.test" value="${build.test}"/>
+             <sysproperty key="test.build.data" 
value="${test.build.dir}/data"/>
+             <sysproperty key="test.build.dir" value="${test.build.dir}"/>
              <sysproperty key="contrib.name" value="${name}"/>
              <sysproperty key="hadoop.log.dir" value="${pig.log.dir}"/>
              <sysproperty key="whichCluster" value="miniCluster"/>
@@ -289,7 +289,7 @@ to call at top-level: ant deploy-contrib
                relative File paths to use the specified user.dir 
                classpath to use build/contrib/*.jar
              -->
-             <sysproperty key="user.dir" value="${build.test}/data"/>
+             <sysproperty key="user.dir" value="${test.build.dir}/data"/>
              
              <sysproperty key="fs.default.name" value="${fs.default.name}"/>
              <sysproperty key="pig.test.localoutputfile" 
value="${pig.test.localoutputfile}"/>
@@ -298,7 +298,7 @@ to call at top-level: ant deploy-contrib
              <formatter type="${test.junit.output.format}" />
 
              <!-- For the time being, we disable some test case to reduce the 
running time -->
-             <batchtest todir="${build.test}">
+             <batchtest todir="${test.build.dir}">
                <fileset dir="${src.test}" includes="**/pig/Test*.java" 
excludes="**/pig/TestCheckin*.java">
                  <not>
                    <filename name="**/pig/TestRealCluster.java"/> <!-- This 
requires a real cluster anyway-->
@@ -451,24 +451,24 @@ to call at top-level: ant deploy-contrib
        </clover-report>
   </target> 
   <target name="smoke-jar" depends="compile,test">
-      <jar destfile="${build.test}/zebra_smoke.jar"
-              basedir="${build.test}"
+      <jar destfile="${test.build.dir}/zebra_smoke.jar"
+              basedir="${test.build.dir}"
                   includes="**/TestSmokeMR*.class, **/TestTableLoaderP*.class"
          />
   </target>
   <target name="package-tests" depends="smoke-jar">
-    <tar longfile="gnu" destfile="${build.test}/zebra_smoke.tar">
+    <tar longfile="gnu" destfile="${test.build.dir}/zebra_smoke.tar">
     <tarfileset dir="${src.test}/smoke"
              fullpath="bin/zebra_smoke_run.pl"
              preserveLeadingSlashes="true">
       <include name="zebra_smoke_run.pl"/>
     </tarfileset>
-    <tarfileset dir="${build.test}/../../../ivy/lib/Pig"
+    <tarfileset dir="${test.build.dir}/../../../ivy/lib/Pig"
              fullpath="lib/junit-4.5.jar"
              preserveLeadingSlashes="true">
       <include name="junit-4.5.jar"/>
     </tarfileset>
-    <tarfileset dir="${build.test}"
+    <tarfileset dir="${test.build.dir}"
              fullpath="lib/zebra_smoke.jar"
              preserveLeadingSlashes="true">
       <include name="zebra_smoke.jar"/>


Reply via email to