You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by na...@apache.org on 2012/06/15 08:01:49 UTC
svn commit: r1350467 - /hive/trunk/build-common.xml
Author: namit
Date: Fri Jun 15 06:01:49 2012
New Revision: 1350467
URL: http://svn.apache.org/viewvc?rev=1350467&view=rev
Log:
HIVE-3092 Hive tests should load Hive classes from build directory, not Ivy cache
(Kevin Wilfong via namit)
Modified:
hive/trunk/build-common.xml
Modified: hive/trunk/build-common.xml
URL: http://svn.apache.org/viewvc/hive/trunk/build-common.xml?rev=1350467&r1=1350466&r2=1350467&view=diff
==============================================================================
--- hive/trunk/build-common.xml (original)
+++ hive/trunk/build-common.xml Fri Jun 15 06:01:49 2012
@@ -86,8 +86,10 @@
<pathelement location="${build.dir.hive}/service/test/classes"/>
<pathelement location="${build.dir.hive}/shims/test/classes"/>
- <fileset dir="${hive.root}/build/ivy/lib/test" includes="*.jar" erroronmissingdir="false" excludes="**/hive_contrib*.jar,**/hive-contrib*.jar"/>
- <fileset dir="${hive.root}/build/ivy/lib/default" includes="*.jar" erroronmissingdir="false" excludes="**/hive_contrib*.jar,**/hive-contrib*.jar" />
+ <!-- Include build/dist/lib on the classpath before Ivy and exclude hive jars from Ivy to make sure we get the local changes when we test Hive -->
+ <fileset dir="${build.dir.hive}/dist/lib" includes="*.jar" erroronmissingdir="false" excludes="**/hive_contrib*.jar,**/hive-contrib*.jar"/>
+ <fileset dir="${hive.root}/build/ivy/lib/test" includes="*.jar" erroronmissingdir="false" excludes="**/hive_*.jar,**/hive-*.jar"/>
+ <fileset dir="${hive.root}/build/ivy/lib/default" includes="*.jar" erroronmissingdir="false" excludes="**/hive_*.jar,**/hive-*.jar" />
<fileset dir="${hive.root}/testlibs" includes="*.jar"/>
<fileset dir="${hive.root}/build/ivy/lib/hadoop0.${hadoop.mr.rev}.shim" includes="*.jar" />
<pathelement location="${build.classes}" />