HADOOP-11950. Add cli option to test-patch to set the project-under-test (Sean Busbey via aw)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2d671e5b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2d671e5b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2d671e5b Branch: refs/heads/HDFS-7240 Commit: 2d671e5b3d865e7e3b423650636c60778567ff97 Parents: baeb479 Author: Allen Wittenauer <[email protected]> Authored: Mon May 11 11:50:01 2015 -0700 Committer: Allen Wittenauer <[email protected]> Committed: Mon May 11 11:50:01 2015 -0700 ---------------------------------------------------------------------- dev-support/test-patch.sh | 13 +++++++++++-- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ 2 files changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2d671e5b/dev-support/test-patch.sh ---------------------------------------------------------------------- diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh index 11fd9a9..ad3d22c 100755 --- a/dev-support/test-patch.sh +++ b/dev-support/test-patch.sh @@ -37,7 +37,6 @@ function setup_defaults PROJECT_NAME=hadoop HOW_TO_CONTRIBUTE="https://wiki.apache.org/hadoop/HowToContribute"; JENKINS=false - PATCH_DIR=/tmp/${PROJECT_NAME}-test-patch/$$ BASEDIR=$(pwd) FINDBUGS_HOME=${FINDBUGS_HOME:-} @@ -585,6 +584,7 @@ function hadoop_usage echo "--modulelist=<list> Specify additional modules to test (comma delimited)" echo "--offline Avoid connecting to the Internet" echo "--patch-dir=<dir> The directory for working and output files (default '/tmp/${PROJECT_NAME}-test-patch/pid')" + echo "--project=<name> The short name for project currently using test-patch (default 'hadoop')" echo "--resetrepo Forcibly clean the repo" echo "--run-tests Run all relevant tests below the base directory" echo "--testlist=<list> Specify which subsystem tests to use (comma delimited)" @@ -695,7 +695,10 @@ function parse_args PATCH=${i#*=} ;; --patch-dir=*) - PATCH_DIR=${i#*=} + USER_PATCH_DIR=${i#*=} + ;; + --project=*) + PROJECT_NAME=${i#*=} ;; --ps-cmd=*) PS=${i#*=} @@ -755,6 +758,12 @@ function parse_args JENKINS=false fi + if [[ -n ${USER_PATCH_DIR} ]]; then + PATCH_DIR="${USER_PATCH_DIR}" + else + PATCH_DIR=/tmp/${PROJECT_NAME}-test-patch/$$ + fi + cd "${CWD}" if [[ ! -d ${PATCH_DIR} ]]; then mkdir -p "${PATCH_DIR}" http://git-wip-us.apache.org/repos/asf/hadoop/blob/2d671e5b/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index f237b85..ee7f09b 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -554,6 +554,9 @@ Release 2.8.0 - UNRELEASED HADOOP-11906. test-patch.sh should use 'file' command for patch determinism (Sean Busbey via aw) + HADOOP-11950. Add cli option to test-patch to set the project-under-test + (Sean Busbey via aw) + OPTIMIZATIONS HADOOP-11785. Reduce the number of listStatus operation in distcp
