You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/04 05:11:39 UTC
svn commit: r1077405 - in
/hadoop/common/branches/branch-0.20-security-patches/src/contrib/streaming:
build.xml src/java/org/apache/hadoop/streaming/StreamJob.java
src/test/org/apache/hadoop/streaming/TestStreamedMerge.java
Author: omalley
Date: Fri Mar 4 04:11:39 2011
New Revision: 1077405
URL: http://svn.apache.org/viewvc?rev=1077405&view=rev
Log:
commit 06b716f88bd54c7e3353a38dbaccd207a03cb78b
Author: Vinod Kumar <vi...@yahoo-inc.com>
Date: Mon Apr 19 11:00:05 2010 +0530
MAPREDUCE:1692. From https://issues.apache.org/jira/secure/attachment/12442134/patch-1692-ydist.txt.
+++ b/YAHOO-CHANGES.txt
+ MAPREDUCE-1692. Remove TestStreamedMerge from the streaming tests.
+ (Amareshwari Sriramadasu and Sreekanth Ramakrishnan via vinodkv)
+
Removed:
hadoop/common/branches/branch-0.20-security-patches/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamedMerge.java
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/contrib/streaming/build.xml
hadoop/common/branches/branch-0.20-security-patches/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java
Modified: hadoop/common/branches/branch-0.20-security-patches/src/contrib/streaming/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/streaming/build.xml?rev=1077405&r1=1077404&r2=1077405&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/contrib/streaming/build.xml (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/contrib/streaming/build.xml Fri Mar 4 04:11:39 2011
@@ -35,22 +35,10 @@ to call at top-level: ant deploy-contrib
</jar>
</target>
- <!-- Run only pure-Java unit tests. superdottest -->
+ <!-- Run all unit tests. superdottest -->
<target name="test">
<antcall target="hadoopbuildcontrib.test">
- <param name="test.exclude" value="TestStreamedMerge"/>
</antcall>
</target>
- <!-- Run all unit tests
- This is not called as part of the nightly build
- because it will only run on platforms that have standard
- Unix utilities available.
- -->
- <target name="test-unix">
- <antcall target="hadoopbuildcontrib.test">
- </antcall>
- </target>
-
-
</project>
Modified: hadoop/common/branches/branch-0.20-security-patches/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java?rev=1077405&r1=1077404&r2=1077405&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java Fri Mar 4 04:11:39 2011
@@ -415,7 +415,6 @@ public class StreamJob implements Tool {
Option info = createBoolOption("info", "print verbose output");
Option help = createBoolOption("help", "print this help message");
Option debug = createBoolOption("debug", "print debug output");
- Option inputtagged = createBoolOption("inputtagged", "inputtagged");
allOptions = new Options().
addOption(input).
@@ -441,7 +440,6 @@ public class StreamJob implements Tool {
addOption(verbose).
addOption(info).
addOption(debug).
- addOption(inputtagged).
addOption(help);
}