Author: cutting
Date: Tue Dec 12 11:36:41 2006
New Revision: 486289
URL: http://svn.apache.org/viewvc?view=rev&rev=486289
Log:
HADOOP-818. Fix contrib unit tests to not depend on core unit tests.
Contributed by Owen.
Added:
lucene/hadoop/trunk/src/contrib/test/
lucene/hadoop/trunk/src/contrib/test/hadoop-site.xml
lucene/hadoop/trunk/src/contrib/test/mapred-default.xml
Modified:
lucene/hadoop/trunk/CHANGES.txt
lucene/hadoop/trunk/src/contrib/build-contrib.xml
Modified: lucene/hadoop/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=486289&r1=486288&r2=486289
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Tue Dec 12 11:36:41 2006
@@ -45,6 +45,9 @@
speed the shuffle and make things more scalable.
(Devaraj Das via cutting)
+13. HADOOP-818. Fix contrib unit tests to not depend on core unit
+ tests. (omalley via cutting)
+
Release 0.9.1 - 2006-12-06
Modified: lucene/hadoop/trunk/src/contrib/build-contrib.xml
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/build-contrib.xml?view=diff&rev=486289&r1=486288&r2=486289
==============================================================================
--- lucene/hadoop/trunk/src/contrib/build-contrib.xml (original)
+++ lucene/hadoop/trunk/src/contrib/build-contrib.xml Tue Dec 12 11:36:41 2006
@@ -27,7 +27,6 @@
<property name="hadoop.log.dir" location="${build.dir}/test/logs"/>
<!-- all jars together -->
<property name="deploy.dir" location="${hadoop.root}/build/"/>
- <property name="minimr.dir" value="${hadoop.root}/build/minimr"/>
<property name="javac.deprecation" value="off"/>
<property name="javac.debug" value="on"/>
@@ -52,8 +51,7 @@
<path id="test.classpath">
<pathelement location="${build.test}" />
<pathelement location="${hadoop.root}/build/test/classes"/>
- <pathelement location="${minimr.dir}" />
- <pathelement location="${hadoop.root}/src/test"/>
+ <pathelement location="${hadoop.root}/src/contrib/test"/>
<pathelement location="${conf.dir}"/>
<pathelement location="${hadoop.root}/build"/>
<path refid="classpath"/>
@@ -72,7 +70,6 @@
<mkdir dir="${build.classes}"/>
<mkdir dir="${build.test}"/>
<mkdir dir="${hadoop.log.dir}"/>
- <mkdir dir="${minimr.dir}"/>
<antcall target="init-contrib"/>
</target>
@@ -137,10 +134,12 @@
<delete dir="${hadoop.log.dir}"/>
<mkdir dir="${hadoop.log.dir}"/>
<junit
- printsummary="withOutAndErr" showoutput="no" haltonfailure="no"
fork="yes"
+ printsummary="yes" showoutput="${test.output}"
+ haltonfailure="no" fork="yes"
errorProperty="tests.failed" failureProperty="tests.failed">
<sysproperty key="test.build.data" value="${build.test}/data"/>
+ <sysproperty key="build.test" value="${build.test}"/>
<!-- requires fork=yes for:
relative File paths to use the specified user.dir
Added: lucene/hadoop/trunk/src/contrib/test/hadoop-site.xml
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/test/hadoop-site.xml?view=auto&rev=486289
==============================================================================
--- lucene/hadoop/trunk/src/contrib/test/hadoop-site.xml (added)
+++ lucene/hadoop/trunk/src/contrib/test/hadoop-site.xml Tue Dec 12 11:36:41
2006
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="nutch-conf.xsl"?>
+
+<!-- Values used when running unit tests. This is mostly empty, to -->
+<!-- use of the default values, overriding the potentially -->
+<!-- user-editted hadoop-site.xml in the conf/ directory. -->
+
+<configuration>
+
+
+<property>
+ <name>hadoop.tmp.dir</name>
+ <value>${build.test}</value>
+ <description>A base for other temporary directories.</description>
+</property>
+
+
+</configuration>
Added: lucene/hadoop/trunk/src/contrib/test/mapred-default.xml
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/test/mapred-default.xml?view=auto&rev=486289
==============================================================================
--- lucene/hadoop/trunk/src/contrib/test/mapred-default.xml (added)
+++ lucene/hadoop/trunk/src/contrib/test/mapred-default.xml Tue Dec 12 11:36:41
2006
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="nutch-conf.xsl"?>
+
+<!-- Values used when running unit tests. This is mostly empty, to -->
+<!-- use of the default values, overriding the potentially -->
+<!-- user-editted mapred-default.xml in the conf/ directory. -->
+
+<configuration>
+
+</configuration>
