From 78cff65f33c9527d20537fee58cc6469d7937c29 Mon Sep 17 00:00:00 2001 From: Hemanth Yamijala Date: Tue, 15 Sep 2009 13:17:07 +0000 Subject: [PATCH] HADOOP-6250. Modify test-patch to delete copied XML files before running patch build. Contributed by Rahul Kumar Singh. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@815317 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 3 +++ src/test/bin/test-patch.sh | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index 36b4df4a73..c712e63d11 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1018,6 +1018,9 @@ Trunk (unreleased changes) 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 diff --git a/src/test/bin/test-patch.sh b/src/test/bin/test-patch.sh index c2135bf522..86e7da7be0 100755 --- a/src/test/bin/test-patch.sh +++ b/src/test/bin/test-patch.sh @@ -254,6 +254,15 @@ checkTests () { 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 @@ checkAuthor RESULT=$? checkTests +if [[ $HUDSON == "true" ]] ; then + cleanUpXml +fi (( RESULT = RESULT + $? )) applyPatch if [[ $? != 0 ]] ; then