Author: nigel
Date: Mon Jul 7 22:10:42 2008
New Revision: 674721
URL: http://svn.apache.org/viewvc?rev=674721&view=rev
Log:
Merge of -r 674719:674720 from trunk to branch-0.18 to fix HADOOP-3653.
Modified:
hadoop/core/branches/branch-0.18/CHANGES.txt
hadoop/core/branches/branch-0.18/src/test/bin/test-patch.sh
Modified: hadoop/core/branches/branch-0.18/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/CHANGES.txt?rev=674721&r1=674720&r2=674721&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.18/CHANGES.txt Mon Jul 7 22:10:42 2008
@@ -723,6 +723,9 @@
HADOOP-3693. Fix archives, distcp and native library documentation to
conform to style guidelines. (Amareshwari Sriramadasu via cdouglas)
+ HADOOP-3653. Fix test-patch target to properly account for Eclipse
+ classpath jars. (Brice Arnould via nigel)
+
Release 0.17.1 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/core/branches/branch-0.18/src/test/bin/test-patch.sh
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/test/bin/test-patch.sh?rev=674721&r1=674720&r2=674721&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/src/test/bin/test-patch.sh (original)
+++ hadoop/core/branches/branch-0.18/src/test/bin/test-patch.sh Mon Jul 7
22:10:42 2008
@@ -466,10 +466,16 @@
###############################################################################
### Tests parts of contrib specific to the eclipse files
runContribTestOnEclipseFiles () {
- export ECLIPSE_DECLARED_JARS=$(sed -n '[EMAIL
PROTECTED]"lib".*path="\(.*jar\)"[EMAIL PROTECTED]@p' <
.eclipse.templates/.classpath |sort)
- export PRESENT_JARS=$(find lib/ -name '*.jar' |sort)
+ export DECLARED_JARS=$(sed -n '[EMAIL
PROTECTED]"lib".*path="\(.*jar\)"[EMAIL PROTECTED]@p' <
.eclipse.templates/.classpath)
+ export PRESENT_JARS=$(find lib/ src/test/lib/ -name '*.jar' |sort)
+ # When run by Hudson, consider libs from ${SUPPORT_DIR} declared
+ if [[ ${HUDSON} == "true" ]]; then
+ DECLARED_JARS="${DECLARED_JARS} $(cd "${SUPPORT_DIR}"; find lib -name
'*.jar')"
+ fi
+ DECLARED_JARS=$(sed 'y/ /\n/' <<< ${DECLARED_JARS} | sort)
export ECLIPSE_DECLARED_SRC=$(sed -n '[EMAIL
PROTECTED]"src".*path="\(.*\)"[EMAIL PROTECTED]@p' <
.eclipse.templates/.classpath |sort)
- if [ "${ECLIPSE_DECLARED_JARS}" != "${PRESENT_JARS}" ]; then
+
+ if [ "${DECLARED_JARS}" != "${PRESENT_JARS}" ]; then
echo "Some jars are not declared in the Eclipse project."
return 1
fi
