knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmin...@apache.org
Subject knox git commit: [KNOX-169] - Test issue for patch test automation via PreCommit-Knox-Build job
Date Fri, 29 Jan 2016 22:30:50 GMT
Repository: knox
Updated Branches:
  refs/heads/master f7459f677 -> fa76388a9


[KNOX-169] - Test issue for patch test automation via PreCommit-Knox-Build job


Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/fa76388a
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/fa76388a
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/fa76388a

Branch: refs/heads/master
Commit: fa76388a910be8596ad0221c69e2d9cb90c8f4b4
Parents: f7459f6
Author: Kevin Minder <kminder@apache.org>
Authored: Fri Jan 29 17:30:11 2016 -0500
Committer: Kevin Minder <kminder@apache.org>
Committed: Fri Jan 29 17:30:11 2016 -0500

----------------------------------------------------------------------
 dev-support/test-patch | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/fa76388a/dev-support/test-patch
----------------------------------------------------------------------
diff --git a/dev-support/test-patch b/dev-support/test-patch
index 16289ce..d60a20a 100755
--- a/dev-support/test-patch
+++ b/dev-support/test-patch
@@ -274,10 +274,9 @@ downloadPatch () {
 }
 ###############################################################################
 applyPatch() {
-    echo "Applying patch" >> $STDOUT
+    echo "Applying patch ${PATCHFILE} in `pwd`" >> $STDOUT
     echo "" >> $STDOUT
-    patch -f -E --dry-run -p0 < ${PATCHFILE} | tee ${REPORTDIR}/APPLY-PATCH.txt \
-        >> $STDOUT
+    patch -f -E --dry-run -p0 --verbose < ${PATCHFILE} | tee ${REPORTDIR}/APPLY-PATCH.txt
>> $STDOUT
     if [[  ${PIPESTATUS[0]} != 0 ]] ; then
         echo "Patch failed to apply to head of branch"
         echo "{color:red}-1{color} Patch failed to apply to head of branch" >> ${SUMMARYFILE}
@@ -397,7 +396,7 @@ WARNINGS=`grep -c "\}WARNING" ${SUMMARYFILE}`
 if [[ $WARNINGS != 0 ]]; then
     echo "{color:red}.   There is at least one warning, please check{color}" >> ${SUMMARYFILE}
 fi
-echo " " >> ${SUMMARYFILE}
+echo "" >> ${SUMMARYFILE}
 
 if [ ! -z "${JIRAISSUE}" ]; then
     echo "The full output of the test-patch run is available at"  >> ${SUMMARYFILE}


Mime
View raw message