HADOOP-11944. add option to test-patch to avoid relocating patch process directory (Sean Busbey via aw)

This commit is contained in:
Allen Wittenauer 2015-05-18 16:13:50 +00:00
parent 182d86dac0
commit bcc17866dd
2 changed files with 18 additions and 13 deletions

View File

@ -38,6 +38,7 @@ function setup_defaults
HOW_TO_CONTRIBUTE="https://wiki.apache.org/hadoop/HowToContribute"
JENKINS=false
BASEDIR=$(pwd)
RELOCATE_PATCH_DIR=false
FINDBUGS_HOME=${FINDBUGS_HOME:-}
ECLIPSE_HOME=${ECLIPSE_HOME:-}
@ -607,6 +608,7 @@ function hadoop_usage
echo "--eclipse-home=<path> Eclipse home directory (default ECLIPSE_HOME environment variable)"
echo "--jira-cmd=<cmd> The 'jira' command to use (default 'jira')"
echo "--jira-password=<pw> The password for the 'jira' command"
echo "--mv-patch-dir Move the patch-dir into the basedir during cleanup."
echo "--wget-cmd=<cmd> The 'wget' command to use (default 'wget')"
}
@ -692,6 +694,9 @@ function parse_args
--mvn-cmd=*)
MVN=${i#*=}
;;
--mv-patch-dir)
RELOCATE_PATCH_DIR=true;
;;
--offline)
OFFLINE=true
;;
@ -2323,9 +2328,8 @@ function cleanup_and_exit
{
local result=$1
if [[ ${JENKINS} == "true" ]] ; then
if [[ -e "${PATCH_DIR}" ]] ; then
if [[ -d "${PATCH_DIR}" ]]; then
if [[ ${JENKINS} == "true" && ${RELOCATE_PATCH_DIR} == "true" && \
-e ${PATCH_DIR} && -d ${PATCH_DIR} ]] ; then
# if PATCH_DIR is already inside BASEDIR, then
# there is no need to move it since we assume that
# Jenkins or whatever already knows where it is at
@ -2336,8 +2340,6 @@ function cleanup_and_exit
mv "${PATCH_DIR}" "${BASEDIR}"
fi
fi
fi
fi
big_console_header "Finished build."
# shellcheck disable=SC2086

View File

@ -578,6 +578,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-11884. test-patch.sh should pull the real findbugs version
(Kengo Seki via aw)
HADOOP-11944. add option to test-patch to avoid relocating patch process
directory (Sean Busbey via aw)
OPTIMIZATIONS
HADOOP-11785. Reduce the number of listStatus operation in distcp