You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ga...@apache.org on 2014/05/09 00:51:44 UTC
svn commit: r1593445 - in /pig/trunk: CHANGES.txt build.xml
Author: gates
Date: Thu May 8 22:51:43 2014
New Revision: 1593445
URL: http://svn.apache.org/r1593445
Log:
PIG-3867 Added hadoop home to build classpath for build pig with unit test on windows
Modified:
pig/trunk/CHANGES.txt
pig/trunk/build.xml
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1593445&r1=1593444&r2=1593445&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Thu May 8 22:51:43 2014
@@ -32,6 +32,8 @@ PIG-2207: Support custom counters for ag
IMPROVEMENTS
+PIG-3867: Added hadoop home to build classpath for build pig with unit test on windows (Sergey Svinarchuk via gates)
+
PIG-3914: Change TaskContext to abstract class (cheolsoo)
PIG-3672: Pig should not check for hardcoded file system implementations (rohini)
Modified: pig/trunk/build.xml
URL: http://svn.apache.org/viewvc/pig/trunk/build.xml?rev=1593445&r1=1593444&r2=1593445&view=diff
==============================================================================
--- pig/trunk/build.xml (original)
+++ pig/trunk/build.xml Thu May 8 22:51:43 2014
@@ -138,6 +138,21 @@
<!-- rats properties -->
<property name="rat.reporting.classname" value="rat.Report"/>
+ <!-- env properties -->
+ <property environment="env"/>
+ <property name="windows" value="false"/>
+ <condition property="isWindows">
+ <equals arg1="${windows}" arg2="true" />
+ </condition>
+
+ <target name="setWindowsPath" if="${isWindows}">
+ <property name="build.path" value="${env.Path};${hadoop.root}\bin" />
+ </target>
+
+ <target name="setLinuxPath" unless="${isWindows}">
+ <property name="build.path" value="${env.PATH};" />
+ </target>
+
<!-- javadoc properties -->
<property name="javadoc.link.java" value="http://download.oracle.com/javase/1.5.0/docs/api/" />
@@ -808,19 +823,19 @@
<!-- ================================================================== -->
<!-- Run unit tests -->
<!-- ================================================================== -->
- <target name="test-core" depends="compile-test,jar-withouthadoop,debugger.check,jackson-pig-3039-test-download" description="Run full set of unit tests">
+ <target name="test-core" depends="setWindowsPath,setLinuxPath,compile-test,jar-withouthadoop,debugger.check,jackson-pig-3039-test-download" description="Run full set of unit tests">
<macro-test-runner test.file="${test.all.file}" />
</target>
- <target name="test-commit" depends="compile-test,jar-withouthadoop,debugger.check" description="Run approximate 10-minute set of unit tests prior to commiting">
+ <target name="test-commit" depends="setWindowsPath,setLinuxPath,compile-test,jar-withouthadoop,debugger.check" description="Run approximate 10-minute set of unit tests prior to commiting">
<macro-test-runner test.file="${test.commit.file}" />
</target>
- <target name="test-unit" depends="compile-test,jar-withouthadoop,debugger.check" description="Run all true unit tests">
+ <target name="test-unit" depends="setWindowsPath,setLinuxPath,compile-test,jar-withouthadoop,debugger.check" description="Run all true unit tests">
<macro-test-runner test.file="${test.unit.file}" />
</target>
- <target name="test-smoke" depends="compile-test,jar-withouthadoop,debugger.check" description="Run 30 min smoke tests">
+ <target name="test-smoke" depends="setWindowsPath,setLinuxPath,compile-test,jar-withouthadoop,debugger.check" description="Run 30 min smoke tests">
<macro-test-runner test.file="${test.smoke.file}" />
</target>
@@ -850,6 +865,7 @@
<sysproperty key="java.security.krb5.kdc" value="" />
<sysproperty key="log4j.configuration" value="file:${basedir}/conf/test-log4j.properties"/>
<env key="MALLOC_ARENA_MAX" value="4"/>
+ <env key="PATH" path="${build.path}"/>
<classpath>
<pathelement location="${output.jarfile.withouthadoop}" />
<pathelement location="${test.build.classes}" />
@@ -944,7 +960,7 @@
</jar>
</target>
- <target name="test-pigunit" depends="compile-test,jar-withouthadoop, pigunit-jar" description="Run tests that test PigUnit">
+ <target name="test-pigunit" depends="setWindowsPath,setLinuxPath,compile-test,jar-withouthadoop, pigunit-jar" description="Run tests that test PigUnit">
<macro-test-runner test.file="${test.pigunit.file}" />
</target>