pig-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From da...@apache.org
Subject svn commit: r1604096 - in /pig/trunk/test: e2e/pig/build.xml perf/pigmix/build.xml
Date Fri, 20 Jun 2014 07:07:22 GMT
Author: daijy
Date: Fri Jun 20 07:07:22 2014
New Revision: 1604096

URL: http://svn.apache.org/r1604096
Log:
PIG-3892: Pig distribution for hadoop 2 (PIG-3892-4.patch)

Modified:
    pig/trunk/test/e2e/pig/build.xml
    pig/trunk/test/perf/pigmix/build.xml

Modified: pig/trunk/test/e2e/pig/build.xml
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/build.xml?rev=1604096&r1=1604095&r2=1604096&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/build.xml (original)
+++ pig/trunk/test/e2e/pig/build.xml Fri Jun 20 07:07:22 2014
@@ -18,7 +18,10 @@
 <project name="TestHarnessPigTests" default="test">
 
   <property name="pig.dir" value="${basedir}/../../.."/>
-  <property name="pig.jar" value="${pig.dir}/pig.jar"/>
+  <condition property="pig.jarname" value="pig-h2.jar" else="pig-h1.jar">
+    <equals arg1="${hadoopversion}" arg2="23" />
+  </condition>
+  <property name="pig.jar" value="${pig.dir}/${pig.jarname}"/>
   <property name="ivy.dir" location="${pig.dir}/ivy" />
   <loadproperties srcfile="${ivy.dir}/libraries.properties"/>
 

Modified: pig/trunk/test/perf/pigmix/build.xml
URL: http://svn.apache.org/viewvc/pig/trunk/test/perf/pigmix/build.xml?rev=1604096&r1=1604095&r2=1604096&view=diff
==============================================================================
--- pig/trunk/test/perf/pigmix/build.xml (original)
+++ pig/trunk/test/perf/pigmix/build.xml Fri Jun 20 07:07:22 2014
@@ -19,7 +19,10 @@
 
   <property name="pig.dir" value="${basedir}/../../.."/>
   <property name="pig.bin" value="${pig.dir}/bin/pig"/>
-  <property name="pig.jar" value="${pig.dir}/pig.jar"/>
+  <condition property="pig.jarname" value="pig-h2.jar" else="pig-h1.jar">
+    <equals arg1="${hadoopversion}" arg2="23" />
+  </condition>
+  <property name="pig.jar" value="${pig.dir}/${pig.jarname}"/>
   <property name="ivy.dir" location="${pig.dir}/ivy" />
   <loadproperties srcfile="${ivy.dir}/libraries.properties"/>
 



Mime
View raw message