svn commit: r1033134 - in /hadoop/zookeeper/trunk: build.xml src/java/test/bin/test-patch.sh

[nigel]

Author: nigel
Date: Tue Nov  9 18:20:57 2010
New Revision: 1033134

URL: http://svn.apache.org/viewvc?rev=1033134&view=rev
Log:
ZOOKEEPER-926. Fork Hadoop common's test-patch.sh and modify for Zookeeper. 
Remove unneeded params from test-patch.sh.

Modified:
    hadoop/zookeeper/trunk/build.xml
    hadoop/zookeeper/trunk/src/java/test/bin/test-patch.sh

Modified: hadoop/zookeeper/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/build.xml?rev=1033134&r1=1033133&r2=1033134&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/build.xml (original)
+++ hadoop/zookeeper/trunk/build.xml Tue Nov  9 18:20:57 2010
@@ -1199,7 +1199,6 @@
                <arg value="${test_patch_sh}"/>
                <arg value="HUDSON"/>
                <arg value="${scratch.dir}"/>
-               <arg value="${support.dir}"/>
                <arg value="${ps.cmd}"/>
                <arg value="${wget.cmd}"/>
                <arg value="${jiracli.cmd}"/>

Modified: hadoop/zookeeper/trunk/src/java/test/bin/test-patch.sh
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/test/bin/test-patch.sh?rev=1033134&r1=1033133&r2=1033134&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/java/test/bin/test-patch.sh (original)
+++ hadoop/zookeeper/trunk/src/java/test/bin/test-patch.sh Tue Nov  9 18:20:57 
2010
@@ -26,25 +26,24 @@ parseArgs() {
     HUDSON)
       ### Set HUDSON to true to indicate that this script is being run by 
Hudson
       HUDSON=true
-      if [[ $# != 16 ]] ; then
-        echo "ERROR: usage $0 HUDSON <PATCH_DIR> <SUPPORT_DIR> <PS_CMD> 
<WGET_CMD> <JIRACLI> <SVN_CMD> <GREP_CMD> <PATCH_CMD> <FINDBUGS_HOME> 
<FORREST_HOME> <WORKSPACE_BASEDIR> <JIRA_PASSWD> <JAVA5_HOME> <CURL_CMD> 
<DEFECT> "
+      if [[ $# != 15 ]] ; then
+        echo "ERROR: usage $0 HUDSON <PATCH_DIR> <PS_CMD> <WGET_CMD> <JIRACLI> 
<SVN_CMD> <GREP_CMD> <PATCH_CMD> <FINDBUGS_HOME> <FORREST_HOME> 
<WORKSPACE_BASEDIR> <JIRA_PASSWD> <JAVA5_HOME> <CURL_CMD> <DEFECT> "
         cleanupAndExit 0
       fi
       PATCH_DIR=$2
-      SUPPORT_DIR=$3
-      PS=$4
-      WGET=$5
-      JIRACLI=$6
-      SVN=$7
-      GREP=$8
-      PATCH=$9
-      FINDBUGS_HOME=${10}
-      FORREST_HOME=${11}
-      BASEDIR=${12}
-      JIRA_PASSWD=${13}
-      JAVA5_HOME=${14}
-      CURL=${15}
-      defect=${16}
+      PS=$3
+      WGET=$4
+      JIRACLI=$5
+      SVN=$6
+      GREP=$7
+      PATCH=$8
+      FINDBUGS_HOME=$9
+      FORREST_HOME=${10}
+      BASEDIR=${11}
+      JIRA_PASSWD=${12}
+      JAVA5_HOME=${13}
+      CURL=${14}
+      defect=${15}
                
       ### Retrieve the defect number
       if [ -z "$defect" ] ; then