svn commit: r935159 - in /hadoop/mapreduce/trunk: CHANGES.txt src/contrib/streaming/build.xml src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamedMerge.java

[yh...@apache.org]

Author: yhemanth
Date: Sat Apr 17 09:37:57 2010
New Revision: 935159

URL: http://svn.apache.org/viewvc?rev=935159&view=rev
Log:
MAPREDUCE-1692. Removed unused testcase TestStreamedMerge. Contributed by Sreekanth Ramakrishnan and Amareshwari Sriramadasu.

Removed:
    hadoop/mapreduce/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamedMerge.java
Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    hadoop/mapreduce/trunk/src/contrib/streaming/build.xml
    hadoop/mapreduce/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=935159&r1=935158&r2=935159&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Sat Apr 17 09:37:57 2010
@@ -534,6 +534,9 @@ Trunk (unreleased changes)
     MAPREDUCE-1031. ant tar target doens't seem to compile tests in contrib
     projects. (Aaron Kimball via tomwhite)
 
+    MAPREDUCE-1692. Removed unused testcase TestStreamedMerge.
+    (Sreekanth Ramakrishnan and Amareshwari Sriramadasu via yhemanth)
+
 Release 0.21.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/mapreduce/trunk/src/contrib/streaming/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/streaming/build.xml?rev=935159&r1=935158&r2=935159&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/streaming/build.xml (original)
+++ hadoop/mapreduce/trunk/src/contrib/streaming/build.xml Sat Apr 17 09:37:57 2010
@@ -37,22 +37,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/mapreduce/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java?rev=935159&r1=935158&r2=935159&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java (original)
+++ hadoop/mapreduce/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java Sat Apr 17 09:37:57 2010
@@ -431,7 +431,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"); 
     Option lazyOutput = createBoolOption("lazyOutput", "create outputs lazily");
     
     allOptions = new Options().
@@ -459,7 +458,6 @@ public class StreamJob implements Tool {
       addOption(verbose).
       addOption(info).
       addOption(debug).
-      addOption(inputtagged).
       addOption(help).
       addOption(lazyOutput);
   }