You are viewing a plain text version of this content. The canonical link for it is here.
Posted to gitbox@yetus.apache.org by aw...@apache.org on 2022/05/04 17:15:44 UTC
[yetus] 09/24: HADOOP-2325. Require Java 6.
This is an automated email from the ASF dual-hosted git repository.
aw pushed a commit to tag prehistory
in repository https://gitbox.apache.org/repos/asf/yetus.git
commit 7c5ccefd9080d0896f359506cd292f600e8a4c79
Author: Doug Cutting <cu...@apache.org>
AuthorDate: Mon Jul 7 20:42:49 2008 +0000
HADOOP-2325. Require Java 6.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@674626 13f79535-47bb-0310-9956-ffa450edef68
---
src/test/bin/test-patch.sh | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/test/bin/test-patch.sh b/src/test/bin/test-patch.sh
index 8699fee6..66a25953 100755
--- a/src/test/bin/test-patch.sh
+++ b/src/test/bin/test-patch.sh
@@ -12,8 +12,8 @@ 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> <ECLIPSE_HOME> <PYTHON_HOME> <WORKSPACE_BASEDIR> <TRIGGER_BUILD> <JIRA_PASSWD>"
+ if [[ $# != 17 ]] ; 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> <ECLIPSE_HOME> <PYTHON_HOME> <WORKSPACE_BASEDIR> <TRIGGER_BUILD> <JIRA_PASSWD> <JAVA5_HOME> "
cleanupAndExit 0
fi
PATCH_DIR=$2
@@ -31,6 +31,7 @@ parseArgs() {
BASEDIR=${14}
TRIGGER_BUILD_URL=${15}
JIRA_PASSWD=${16}
+ JAVA5_HOME=${17}
### Retrieve the defect number
if [ ! -e $PATCH_DIR/defectNum ] ; then
echo "Could not determine the patch to test. Exiting."
@@ -47,8 +48,8 @@ parseArgs() {
DEVELOPER)
### Set HUDSON to false to indicate that this script is being run by a developer
HUDSON=false
- if [[ $# != 9 ]] ; then
- echo "ERROR: usage $0 DEVELOPER <PATCH_FILE> <SCRATCH_DIR> <SVN_CMD> <GREP_CMD> <PATCH_CMD> <FINDBUGS_HOME> <FORREST_HOME> <WORKSPACE_BASEDIR>"
+ if [[ $# != 10 ]] ; then
+ echo "ERROR: usage $0 DEVELOPER <PATCH_FILE> <SCRATCH_DIR> <SVN_CMD> <GREP_CMD> <PATCH_CMD> <FINDBUGS_HOME> <FORREST_HOME> <WORKSPACE_BASEDIR> <JAVA5_HOME>"
cleanupAndExit 0
fi
### PATCH_FILE contains the location of the patchfile
@@ -74,6 +75,7 @@ parseArgs() {
FINDBUGS_HOME=$7
FORREST_HOME=$8
BASEDIR=$9
+ JAVA5_HOME=$10
### Obtain the patch filename to append it to the version number
defect=`basename $PATCH_FILE`
;;
@@ -450,7 +452,7 @@ runCoreTests () {
### Kill any rogue build processes from the last attempt
$PS -auxwww | $GREP HadoopPatchProcess | /usr/bin/nawk '{print $2}' | /usr/bin/xargs -t -I {} /usr/bin/kill -9 {} > /dev/null
- $ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME create-c++-configure docs tar test-core
+ $ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME create-c++-configure docs tar test-core
if [[ $? != 0 ]] ; then
JIRA_COMMENT="$JIRA_COMMENT