From c24b4809de4f208e4479a2e128b84fa249bf3ac0 Mon Sep 17 00:00:00 2001
From: Thomas White <tomwhite@apache.org>
Date: Mon, 12 Dec 2011 20:48:06 +0000
Subject: [PATCH] Merge -r 1213431:1213432 from trunk to branch-0.23. Fixes:
 HADOOP-7912

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213434 13f79535-47bb-0310-9956-ffa450edef68
---
 dev-support/test-patch.sh                     | 31 +++++++++++++++++++
 .../hadoop-common/CHANGES.txt                 |  3 ++
 2 files changed, 34 insertions(+)

diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh
index 9346bc38c74..94a8f75747e 100755
--- a/dev-support/test-patch.sh
+++ b/dev-support/test-patch.sh
@@ -583,6 +583,35 @@ $JIRA_COMMENT_FOOTER"
   return 0
 }
 
+###############################################################################
+### Verify eclipse:eclipse works
+checkEclipseGeneration () {
+  echo ""
+  echo ""
+  echo "======================================================================"
+  echo "======================================================================"
+  echo "    Running mvn eclipse:eclipse."
+  echo "======================================================================"
+  echo "======================================================================"
+  echo ""
+  echo ""
+
+  echo "$MVN eclipse:eclipse -D${PROJECT_NAME}PatchProcess"
+  $MVN eclipse:eclipse -D${PROJECT_NAME}PatchProcess
+  if [[ $? != 0 ]] ; then
+      JIRA_COMMENT="$JIRA_COMMENT
+
+    -1 eclipse:eclipse.  The patch failed to build with eclipse:eclipse."
+    return 1
+  fi
+  JIRA_COMMENT="$JIRA_COMMENT
+
+    +1 eclipse:eclipse.  The patch built with eclipse:eclipse."
+  return 0
+}
+
+
+
 ###############################################################################
 ### Run the tests
 runTests () {
@@ -788,6 +817,8 @@ checkJavadocWarnings
 (( RESULT = RESULT + $? ))
 checkJavacWarnings
 (( RESULT = RESULT + $? ))
+checkEclipseGeneration
+(( RESULT = RESULT + $? ))
 ### Checkstyle not implemented yet
 #checkStyle
 #(( RESULT = RESULT + $? ))
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 5e2f6066115..f198d2b6ea0 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -38,6 +38,9 @@ Release 0.23.1 - Unreleased
 
     HADOOP-7758. Make GlobFilter class public. (tucu)
 
+    HADOOP-7912. test-patch should run eclipse:eclipse to verify that it does
+    not break again. (Robert Joseph Evans via tomwhite)
+
   OPTIMIZATIONS
 
   BUG FIXES