Author: tucu
Date: Thu Oct 4 16:28:37 2012
New Revision: 1394143
URL: http://svn.apache.org/viewvc?rev=1394143&view=rev
Log:
test-patch fixes (tucu)
Modified:
oozie/trunk/bin/test-patch
oozie/trunk/bin/test-patch-00-clean
oozie/trunk/bin/test-patch-05-patch-raw-analysis
oozie/trunk/bin/test-patch-08-rat
oozie/trunk/bin/test-patch-09-javadoc
oozie/trunk/bin/test-patch-10-compile
oozie/trunk/bin/test-patch-15-backwards-compatibility
oozie/trunk/bin/test-patch-20-tests
oozie/trunk/bin/test-patch-30-distro
oozie/trunk/bin/test-patch-XX-template
oozie/trunk/bin/test-patch-find-new-patch-available-jiras
Modified: oozie/trunk/bin/test-patch
URL:
http://svn.apache.org/viewvc/oozie/trunk/bin/test-patch?rev=1394143&r1=1394142&r2=1394143&view=diff
==============================================================================
--- oozie/trunk/bin/test-patch (original)
+++ oozie/trunk/bin/test-patch Thu Oct 4 16:28:37 2012
@@ -286,7 +286,7 @@ applyPatch() {
fi
echo "" >> $STDOUT
echo "Patch applied"
- echo "{color:green}+1{color} PATCH_APPLIES" >> $SUMMARYFILE
+ echo "{color:green}+1 PATCH_APPLIES{color}" >> $SUMMARYFILE
echo
}
###############################################################################
Modified: oozie/trunk/bin/test-patch-00-clean
URL:
http://svn.apache.org/viewvc/oozie/trunk/bin/test-patch-00-clean?rev=1394143&r1=1394142&r2=1394143&view=diff
==============================================================================
--- oozie/trunk/bin/test-patch-00-clean (original)
+++ oozie/trunk/bin/test-patch-00-clean Thu Oct 4 16:28:37 2012
@@ -83,15 +83,16 @@ parseArgs "$@"
case $OP in
pre)
mvn clean ${MVNPASSTHRU} > ${TEMPDIR}/${TASKNAME}.txt
+ EXITCODE=$?
# removing files created outside of target/ by pig-main and hive-main
testcases
- rm core/pig*
- rm core/hive*
- exit $?
+ rm -f core/pig*
+ rm -f core/hive*
+ exit $EXITCODE
;;
post)
;;
report)
- echo "{color:green}+1{color} ${TASKNAME} cleaned target directories" >>
$SUMMARYFILE
+ echo "{color:green}+1 ${TASKNAME}{color}" >> $SUMMARYFILE
;;
esac
Modified: oozie/trunk/bin/test-patch-05-patch-raw-analysis
URL:
http://svn.apache.org/viewvc/oozie/trunk/bin/test-patch-05-patch-raw-analysis?rev=1394143&r1=1394142&r2=1394143&view=diff
==============================================================================
--- oozie/trunk/bin/test-patch-05-patch-raw-analysis (original)
+++ oozie/trunk/bin/test-patch-05-patch-raw-analysis Thu Oct 4 16:28:37 2012
@@ -140,9 +140,9 @@ case $OP in
checkForTestcases
total=`expr $authorTags + $tabs + $trailingSpaces + $longLines +
$testcases`
if [[ $total == 0 ]] ; then
- echo "{color:green}+1{color} ${TASKNAME}" >> $SUMMARYFILE
+ echo "{color:green}+1 ${TASKNAME}{color}" >> $SUMMARYFILE
else
- echo "{color:red}-1{color} ${TASKNAME}" >> $SUMMARYFILE
+ echo "{color:red}-1 ${TASKNAME}{color}" >> $SUMMARYFILE
fi
for line in "${REPORT[@]}" ; do
echo ". ${line}" >> $SUMMARYFILE
Modified: oozie/trunk/bin/test-patch-08-rat
URL:
http://svn.apache.org/viewvc/oozie/trunk/bin/test-patch-08-rat?rev=1394143&r1=1394142&r2=1394143&view=diff
==============================================================================
--- oozie/trunk/bin/test-patch-08-rat (original)
+++ oozie/trunk/bin/test-patch-08-rat Thu Oct 4 16:28:37 2012
@@ -112,9 +112,9 @@ case $OP in
report)
checkForWarnings
if [[ $newWarns == 0 ]] ; then
- echo "{color:green}+1{color} ${TASKNAME}" >> $SUMMARYFILE
+ echo "{color:green}+1 ${TASKNAME}{color}" >> $SUMMARYFILE
else
- echo "{color:red}-1{color} ${TASKNAME}" >> $SUMMARYFILE
+ echo "{color:red}-1 ${TASKNAME}{color}" >> $SUMMARYFILE
fi
for line in "${REPORT[@]}" ; do
echo ". ${line}" >> $SUMMARYFILE
Modified: oozie/trunk/bin/test-patch-09-javadoc
URL:
http://svn.apache.org/viewvc/oozie/trunk/bin/test-patch-09-javadoc?rev=1394143&r1=1394142&r2=1394143&view=diff
==============================================================================
--- oozie/trunk/bin/test-patch-09-javadoc (original)
+++ oozie/trunk/bin/test-patch-09-javadoc Thu Oct 4 16:28:37 2012
@@ -105,9 +105,9 @@ case $OP in
report)
checkForWarnings
if [[ $newWarns == 0 ]] ; then
- echo "{color:green}+1{color} ${TASKNAME}" >> $SUMMARYFILE
+ echo "{color:green}+1 ${TASKNAME}{color}" >> $SUMMARYFILE
else
- echo "{color:red}-1{color} ${TASKNAME}" >> $SUMMARYFILE
+ echo "{color:red}-1 ${TASKNAME}{color}" >> $SUMMARYFILE
fi
for line in "${REPORT[@]}" ; do
echo ". ${line}" >> $SUMMARYFILE
Modified: oozie/trunk/bin/test-patch-10-compile
URL:
http://svn.apache.org/viewvc/oozie/trunk/bin/test-patch-10-compile?rev=1394143&r1=1394142&r2=1394143&view=diff
==============================================================================
--- oozie/trunk/bin/test-patch-10-compile (original)
+++ oozie/trunk/bin/test-patch-10-compile Thu Oct 4 16:28:37 2012
@@ -128,9 +128,9 @@ case $OP in
checkForWarnings
total=`expr $compileErrors + $newWarns`
if [[ $total == 0 ]] ; then
- echo "{color:green}+1{color} ${TASKNAME}" >> $SUMMARYFILE
+ echo "{color:green}+1 ${TASKNAME}{color}" >> $SUMMARYFILE
else
- echo "{color:red}-1{color} ${TASKNAME}" >> $SUMMARYFILE
+ echo "{color:red}-1 ${TASKNAME}{color}" >> $SUMMARYFILE
fi
for line in "${REPORT[@]}" ; do
echo ". ${line}" >> $SUMMARYFILE
Modified: oozie/trunk/bin/test-patch-15-backwards-compatibility
URL:
http://svn.apache.org/viewvc/oozie/trunk/bin/test-patch-15-backwards-compatibility?rev=1394143&r1=1394142&r2=1394143&view=diff
==============================================================================
--- oozie/trunk/bin/test-patch-15-backwards-compatibility (original)
+++ oozie/trunk/bin/test-patch-15-backwards-compatibility Thu Oct 4 16:28:37
2012
@@ -107,9 +107,9 @@ case $OP in
checkJPAFiles
total=`expr $annotations + $jpaFiles`
if [[ $total == 0 ]] ; then
- echo "{color:green}+1{color} ${TASKNAME}" >> $SUMMARYFILE
+ echo "{color:green}+1 ${TASKNAME}{color}" >> $SUMMARYFILE
else
- echo "{color:red}-1{color} ${TASKNAME}" >> $SUMMARYFILE
+ echo "{color:red}-1 ${TASKNAME}{color}" >> $SUMMARYFILE
fi
for line in "${REPORT[@]}" ; do
echo ". ${line}" >> $SUMMARYFILE
Modified: oozie/trunk/bin/test-patch-20-tests
URL:
http://svn.apache.org/viewvc/oozie/trunk/bin/test-patch-20-tests?rev=1394143&r1=1394142&r2=1394143&view=diff
==============================================================================
--- oozie/trunk/bin/test-patch-20-tests (original)
+++ oozie/trunk/bin/test-patch-20-tests Thu Oct 4 16:28:37 2012
@@ -96,7 +96,7 @@ case $OP in
# versions of antlr. Once we move to Pig 0.10 then we don't need this.
mvn test -Dtest=TestHiveActionExecutor,TestHiveMain ${MVNPASSTHRU} \
-PtestHive -Dmaven.test.failure.ignore=true
-Dmaven.test.error.ignore=true \
- -fae -Doozie.test.waitfor.ratio=3 -Dtest.timeout=7200 \
+ -Doozie.test.waitfor.ratio=3 -Dtest.timeout=7200 \
| tee -a ${TEMPDIR}/${TASKNAME}.out >> $STDOUT
exitCode=`expr $exitCode + ${PIPESTATUS[0]}`
fi
@@ -107,18 +107,19 @@ case $OP in
testsRun=`grep "Tests run:" ${TEMPDIR}/${TASKNAME}.out | grep -v " Time
elapsed:" | awk '{print $3}' | sed 's/,//' | awk 'BEGIN {count=0}
{count=count+$1} END {print "Tests run: "count}'`
testsFailed=`grep "Tests run:" ${TEMPDIR}/${TASKNAME}.out | grep -v " Time
elapsed:" | awk '{print $5}' | sed 's/,//' | awk 'BEGIN {count=0}
{count=count+$1} END {print "Tests failures: "count}'`
testsErrors=`grep "Tests run:" ${TEMPDIR}/${TASKNAME}.out | grep -v " Time
elapsed:" | awk '{print $7}' | sed 's/,//' | awk 'BEGIN {count=0}
{count=count+$1} END {print "Tests errors: "count}'`
+ hasFailures=`expr $testFailed + $testsErrors`
testsExitCode=`cat ${TEMPDIR}/${TASKNAME}.exitCode`
- if [[ "$testsExitCode" != "0" ]] ; then
- if [ -n "${failedTests}" ] ; then
- echo "{color:red}-1{color} ${TASKNAME} - the patch failed the
following testcases:" >> $SUMMARYFILE
- echo "" >> ${SUMMARYFILE}
- echo "${failedTests}" >> $SUMMARYFILE
- echo "" >> ${SUMMARYFILE}
+ if [[ $hasFailures != 0 ]] ; then
+ echo "{color:red}-1 ${TASKNAME}{color} - the patch failed the following
testcases:" >> $SUMMARYFILE
+ echo "" >> ${SUMMARYFILE}
+ echo "${failedTests}" >> $SUMMARYFILE
+ echo "" >> ${SUMMARYFILE}
+ else
+ if [[ "$testsExitCode" != "0" ]] ; then
+ echo "{color:red}-1 ${TASKNAME}{color} - patch does not compile,
cannot run testcases" >> $SUMMARYFILE
else
- echo "{color:red}-1{color} ${TASKNAME} - patch does not compile,
cannot run testcases" >> $SUMMARYFILE
+ echo "{color:green}+1 ${TASKNAME}{color}" >> $SUMMARYFILE
fi
- else
- echo "{color:green}+1{color} ${TASKNAME}" >> $SUMMARYFILE
fi
echo ". $testsRun" >> $SUMMARYFILE
echo ". $testsFailed" >> $SUMMARYFILE
Modified: oozie/trunk/bin/test-patch-30-distro
URL:
http://svn.apache.org/viewvc/oozie/trunk/bin/test-patch-30-distro?rev=1394143&r1=1394142&r2=1394143&view=diff
==============================================================================
--- oozie/trunk/bin/test-patch-30-distro (original)
+++ oozie/trunk/bin/test-patch-30-distro Thu Oct 4 16:28:37 2012
@@ -94,10 +94,10 @@ case $OP in
report)
exitCode=`cat ${TEMPDIR}/${TASKNAME}.exitCode`
if [[ "$exitCode" != "0" ]] ; then
- echo "{color:red}-1{color} ${TASKNAME}" >> $SUMMARYFILE
+ echo "{color:red}-1 ${TASKNAME}{color}" >> $SUMMARYFILE
echo ". {color:red}-1{color} distro tarball fails with the patch" >>
$SUMMARYFILE
else
- echo "{color:green}+1{color} ${TASKNAME}" >> $SUMMARYFILE
+ echo "{color:green}+1 ${TASKNAME}{color}" >> $SUMMARYFILE
echo ". {color:green}+1{color} distro tarball builds with the patch "
>> $SUMMARYFILE
fi
;;
Modified: oozie/trunk/bin/test-patch-XX-template
URL:
http://svn.apache.org/viewvc/oozie/trunk/bin/test-patch-XX-template?rev=1394143&r1=1394142&r2=1394143&view=diff
==============================================================================
--- oozie/trunk/bin/test-patch-XX-template (original)
+++ oozie/trunk/bin/test-patch-XX-template Thu Oct 4 16:28:37 2012
@@ -76,7 +76,7 @@ parseArgs() {
parseArgs "$@"
-echo " Running COMPILE op=$OP"
+echo " Running XX op=$OP"
case $OP in
pre)
@@ -84,7 +84,7 @@ case $OP in
post)
;;
report)
- echo "{color:green}+1{color} ${TASKNAME}" >> $SUMMARYFILE
+ echo "{color:green}+1 ${TASKNAME}{color}" >> $SUMMARYFILE
;;
esac
Modified: oozie/trunk/bin/test-patch-find-new-patch-available-jiras
URL:
http://svn.apache.org/viewvc/oozie/trunk/bin/test-patch-find-new-patch-available-jiras?rev=1394143&r1=1394142&r2=1394143&view=diff
==============================================================================
--- oozie/trunk/bin/test-patch-find-new-patch-available-jiras (original)
+++ oozie/trunk/bin/test-patch-find-new-patch-available-jiras Thu Oct 4
16:28:37 2012
@@ -108,7 +108,7 @@ done
}
###############################################################################
-mkdir ${TEMPDIR} 2> $STDOUT
+mkdir ${TEMPDIR} 2>&1 $STDOUT
parseArgs "$@"
