Author: yanz
Date: Tue Jun 15 19:59:51 2010
New Revision: 955029
URL: http://svn.apache.org/viewvc?rev=955029view=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=955029r1=955028r2=955029view=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=955029r1=955028r2=955029view=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=955029r1=955028r2=955029view=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}