[yetus] 08/24: HADOOP-3480. Need to update Eclipse template to reflect current trunk. Contributed by Brice Arnould.

[aw...@apache.org]

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 2e98160552f4cea1bccbaceab74e525569d18a93
Author: Thomas White <to...@apache.org>
AuthorDate: Wed Jun 25 14:31:03 2008 +0000

    HADOOP-3480.  Need to update Eclipse template to reflect current trunk.  Contributed by Brice Arnould.
    
    git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@671563 13f79535-47bb-0310-9956-ffa450edef68
---
 src/test/bin/test-patch.sh | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/test/bin/test-patch.sh b/src/test/bin/test-patch.sh
index e3d5ba8f..8699fee6 100755
--- a/src/test/bin/test-patch.sh
+++ b/src/test/bin/test-patch.sh
@@ -463,6 +463,22 @@ runCoreTests () {
   return 0
 }
 
+###############################################################################
+### Tests parts of contrib specific to the eclipse files
+runContribTestOnEclipseFiles () {
+  export ECLIPSE_DECLARED_JARS=$(sed -n 's@.*kind="lib".*path="\(.*jar\)".*@\1@p' < .eclipse.templates/.classpath |sort)
+  export PRESENT_JARS=$(find lib/ -name '*.jar' |sort)
+  export ECLIPSE_DECLARED_SRC=$(sed -n 's@.*kind="src".*path="\(.*\)".*@\1@p' < .eclipse.templates/.classpath |sort)
+  if [ "${ECLIPSE_DECLARED_JARS}" != "${PRESENT_JARS}" ]; then
+    echo "Some jars are not declared in the Eclipse project."
+    return 1
+  fi
+  for dir in $ECLIPSE_DECLARED_SRC; do
+    [ '!' -d $dir ] && echo "$dir is referenced in the Eclipse project although it doesn't exists anymore." && return 1
+  done
+  return 0
+}
+
 ###############################################################################
 ### Run the test-contrib target
 runContribTests () {
@@ -479,7 +495,7 @@ runContribTests () {
   ### 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}" $ECLIPSE_PROPERTY $PYTHON_PROPERTY -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes test-contrib
+  $ANT_HOME/bin/ant -Dversion="${VERSION}" $ECLIPSE_PROPERTY $PYTHON_PROPERTY -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes test-contrib && runContribTestOnEclipseFiles
   if [[ $? != 0 ]] ; then
     JIRA_COMMENT="$JIRA_COMMENT