Author: yhemanth
Date: Tue Sep 15 13:17:07 2009
New Revision: 815317
URL: http://svn.apache.org/viewvc?rev=815317&view=rev
Log:
HADOOP-6250. Modify test-patch to delete copied XML files before running patch
build. Contributed by Rahul Kumar Singh.
Modified:
hadoop/common/trunk/CHANGES.txt
hadoop/common/trunk/src/test/bin/test-patch.sh
Modified: hadoop/common/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=815317&r1=815316&r2=815317&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Tue Sep 15 13:17:07 2009
@@ -1018,6 +1018,9 @@
header would cause the reader to read the sync marker as a record. (Jay
Booth via cdouglas)
+ HADOOP-6250. Modify test-patch to delete copied XML files before running
+ patch build. (Rahul Kumar Singh via yhemanth)
+
Release 0.20.1 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/common/trunk/src/test/bin/test-patch.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/src/test/bin/test-patch.sh?rev=815317&r1=815316&r2=815317&view=diff
==============================================================================
--- hadoop/common/trunk/src/test/bin/test-patch.sh (original)
+++ hadoop/common/trunk/src/test/bin/test-patch.sh Tue Sep 15 13:17:07 2009
@@ -254,6 +254,15 @@
return 0
}
+cleanUpXml () {
+ cd $BASEDIR/conf
+ for file in `ls *.xml.template`
+ do
+ rm -f `basename $file .template`
+ done
+ cd $BASEDIR
+}
+
###############################################################################
### Attempt to apply the patch
applyPatch () {
@@ -682,6 +691,9 @@
RESULT=$?
checkTests
+if [[ $HUDSON == "true" ]] ; then
+ cleanUpXml
+fi
(( RESULT = RESULT + $? ))
applyPatch
if [[ $? != 0 ]] ; then
