From 2d671e5b3d865e7e3b423650636c60778567ff97 Mon Sep 17 00:00:00 2001
From: Allen Wittenauer <aw@apache.org>
Date: Mon, 11 May 2015 11:50:01 -0700
Subject: [PATCH] HADOOP-11950. Add cli option to test-patch to set the
 project-under-test (Sean Busbey via aw)

---
 dev-support/test-patch.sh                       | 13 +++++++++++--
 hadoop-common-project/hadoop-common/CHANGES.txt |  3 +++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh
index 11fd9a9719..ad3d22c3f6 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}"
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index f237b85fef..ee7f09b5ad 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