svn commit: r1036742 - /hadoop/common/trunk/src/test/bin/test-patch.sh

[nigel]

Author: nigel
Date: Fri Nov 19 05:19:30 2010
New Revision: 1036742

URL: http://svn.apache.org/viewvc?rev=1036742&view=rev
Log:
HADOOP-7042. Updates to test-patch.sh to include failed test names and improve 
other messaging.  Contributed by nigel.

Modified:
    hadoop/common/trunk/src/test/bin/test-patch.sh

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=1036742&r1=1036741&r2=1036742&view=diff
==============================================================================
--- hadoop/common/trunk/src/test/bin/test-patch.sh (original)
+++ hadoop/common/trunk/src/test/bin/test-patch.sh Fri Nov 19 05:19:30 2010
@@ -498,10 +498,11 @@ runCoreTests () {
      PreTestTarget="create-c++-configure"
   fi
 
-  echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= 
-Dtest.junit.output.format=xml -Dtest.output=yes -Dcompile.c++=yes 
-Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME $PreTestTarget test-core"
-  $ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= 
-Dtest.junit.output.format=xml -Dtest.output=yes -Dcompile.c++=yes 
-Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME $PreTestTarget test-core
+  echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= 
-Dtest.junit.output.format=xml -Dtest.output=no -Dcompile.c++=yes 
-Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME $PreTestTarget test-core"
+  $ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= 
-Dtest.junit.output.format=xml -Dtest.output=no -Dcompile.c++=yes 
-Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME $PreTestTarget test-core
   if [[ $? != 0 ]] ; then
-    failed_tests=`grep -l "<failure" build/test/*.xml | sed -e 
"s|build/test/TEST-|                  |g" | sed -e "s|\.xml||g"`
+    ### Find and format names of failed tests
+    failed_tests=`grep -l -E "<failure|<error" 
$WORKSPACE/trunk/build/test/*.xml | sed -e "s|.*build/test/TEST-|               
   |g" | sed -e "s|\.xml||g"`
     JIRA_COMMENT="$JIRA_COMMENT
 
     -1 core tests.  The patch failed these core unit tests:
@@ -530,8 +531,8 @@ runContribTests () {
   ### Kill any rogue build processes from the last attempt
   $PS -auxwww | $GREP HadoopPatchProcess | /usr/bin/nawk '{print $2}' | 
/usr/bin/xargs -t -I {} /bin/kill -9 {} > /dev/null
 
-  echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" $ECLIPSE_PROPERTY 
$PYTHON_PROPERTY -DHadoopPatchProcess= -Dtest.junit.output.format=xml 
-Dtest.output=yes test-contrib"
-  $ANT_HOME/bin/ant -Dversion="${VERSION}" $ECLIPSE_PROPERTY $PYTHON_PROPERTY 
-DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes 
test-contrib
+  echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" $ECLIPSE_PROPERTY 
$PYTHON_PROPERTY -DHadoopPatchProcess= -Dtest.junit.output.format=xml 
-Dtest.output=no test-contrib"
+  $ANT_HOME/bin/ant -Dversion="${VERSION}" $ECLIPSE_PROPERTY $PYTHON_PROPERTY 
-DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=no 
test-contrib
   if [[ $? != 0 ]] ; then
     JIRA_COMMENT="$JIRA_COMMENT
 
@@ -560,8 +561,8 @@ checkInjectSystemFaults () {
   ### Kill any rogue build processes from the last attempt
   $PS auxwww | $GREP HadoopPatchProcess | /usr/bin/nawk '{print $2}' | 
/usr/bin/xargs -t -I {} /bin/kill -9 {} > /dev/null
 
-  echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= 
-Dtest.junit.output.format=xml -Dtest.output=yes -Dcompile.c++=yes 
-Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME inject-system-faults"
-  $ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= 
-Dtest.junit.output.format=xml -Dtest.output=yes -Dcompile.c++=yes 
-Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME inject-system-faults
+  echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= 
-Dtest.junit.output.format=xml -Dtest.output=no -Dcompile.c++=yes 
-Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME inject-system-faults"
+  $ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= 
-Dtest.junit.output.format=xml -Dtest.output=no -Dcompile.c++=yes 
-Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME inject-system-faults
   if [[ $? != 0 ]] ; then
     JIRA_COMMENT="$JIRA_COMMENT