geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r611724 - in /geronimo/gbuild/daily_build_scripts: gbuild.sh testsuite.sh
Date Mon, 14 Jan 2008 06:27:24 GMT
Author: gawor
Date: Sun Jan 13 22:27:21 2008
New Revision: 611724

URL: http://svn.apache.org/viewvc?rev=611724&view=rev
Log:
build should fail if any test in any assembly fails

Modified:
    geronimo/gbuild/daily_build_scripts/gbuild.sh
    geronimo/gbuild/daily_build_scripts/testsuite.sh

Modified: geronimo/gbuild/daily_build_scripts/gbuild.sh
URL: http://svn.apache.org/viewvc/geronimo/gbuild/daily_build_scripts/gbuild.sh?rev=611724&r1=611723&r2=611724&view=diff
==============================================================================
--- geronimo/gbuild/daily_build_scripts/gbuild.sh (original)
+++ geronimo/gbuild/daily_build_scripts/gbuild.sh Sun Jan 13 22:27:21 2008
@@ -189,7 +189,7 @@
    then
      . $SCRIPT_DIR/testsuite.sh ${BRANCH_ID} ${BRANCH_DIR}
 
-     grep -E "BUILD ERROR|FAILURE!|Failed to start Geronimo server" $testLog
+     grep -E "BUILD ERROR|FAILURE!|Failed to start Geronimo server" $mergedTestLog
      if [ $? -eq 0 ]
      then
        result="failed"

Modified: geronimo/gbuild/daily_build_scripts/testsuite.sh
URL: http://svn.apache.org/viewvc/geronimo/gbuild/daily_build_scripts/testsuite.sh?rev=611724&r1=611723&r2=611724&view=diff
==============================================================================
--- geronimo/gbuild/daily_build_scripts/testsuite.sh (original)
+++ geronimo/gbuild/daily_build_scripts/testsuite.sh Sun Jan 13 22:27:21 2008
@@ -52,10 +52,12 @@
 
    mkdir -p $LOG_DIR
    testLog=$LOG_DIR/test.log
+   mergedTestLog=$LOG_DIR/merged-test.log
    ds=`date +%Y%m%d`
 
    cd $BRANCH_TEST_DIR/testsuite
    mvn -B -Pheadless,default -DassemblyId=$CONTAINER -DexcludeTest=$EXCLUDE_TESTS > $testLog
+   cat $testLog >> $mergedTestLog
    mvn -B site-deploy -DbuildNumber=$ds-$BRANCH_ID-$CONTAINER >> deploy.log
 
    createLogsDir geronimo.log



Mime
View raw message