svn commit: r631018 - in /geronimo/gbuild/daily_build_scripts: gbuild.sh tck.sh

[ga...@apache.org]

Author: gawor
Date: Mon Feb 25 14:13:03 2008
New Revision: 631018

URL: http://svn.apache.org/viewvc?rev=631018&view=rev
Log:
pass branch id to tck script

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

Modified: geronimo/gbuild/daily_build_scripts/gbuild.sh
URL: http://svn.apache.org/viewvc/geronimo/gbuild/daily_build_scripts/gbuild.sh?rev=631018&r1=631017&r2=631018&view=diff
==============================================================================
--- geronimo/gbuild/daily_build_scripts/gbuild.sh (original)
+++ geronimo/gbuild/daily_build_scripts/gbuild.sh Mon Feb 25 14:13:03 2008
@@ -213,7 +213,7 @@
 
    mail_results $result
 
-   . $SCRIPT_DIR/tck.sh ${TCK_BRANCH}
+   . $SCRIPT_DIR/tck.sh ${BRANCH_ID} ${TCK_BRANCH}
 
 else
   # if build failed, publish unit test reports

Modified: geronimo/gbuild/daily_build_scripts/tck.sh
URL: http://svn.apache.org/viewvc/geronimo/gbuild/daily_build_scripts/tck.sh?rev=631018&r1=631017&r2=631018&view=diff
==============================================================================
--- geronimo/gbuild/daily_build_scripts/tck.sh (original)
+++ geronimo/gbuild/daily_build_scripts/tck.sh Mon Feb 25 14:13:03 2008
@@ -29,6 +29,8 @@
 
 tckLog=tck-$ts.log
 
+TCK_BRANCH_ID=$1
+TCK_BRANCH=$2
 
 function send_mail() {
    subject=$1
@@ -44,14 +46,14 @@
 cd $TEST_DIR
 rm -rf tck
 
-svn co https://svn.apache.org/repos/tck/geronimo-tck/porting/branches/$1 tck
+svn co https://svn.apache.org/repos/tck/geronimo-tck/porting/branches/$TCK_BRANCH tck
 
 cd tck
 tckrev=`svn info | grep Revision | awk -F: '{print $2}'`
 tckrev=${tckrev#* }
 
 
-echo "Geronimo $1 at $rev" >> $tckLog
+echo "Geronimo $TCK_BRANCH at $rev" >> $tckLog
 if [ "$BUILD_OPENEJB" = "true" ]
 then
   echo "OpenEJB trunk at $openejbrev" >> $tckLog
@@ -67,7 +69,7 @@
 
 # Run Jetty tests.
   echo "====== Jetty TCK Test =======" >> jetty-$tckLog
-  echo "Geronimo $1 at $rev" >> jetty-$tckLog
+  echo "Geronimo $TCK_BRANCH at $rev" >> jetty-$tckLog
   if [ "$BUILD_OPENEJB" = "true" ]
   then
      echo "OpenEJB trunk at $openejbrev" >> jetty-$tckLog
@@ -87,16 +89,16 @@
 
   if [[ $failed != " 0"   ||  $errors != " 0" ||  $ERROR != " 0" ]]
   then
-    subject="[Jetty $1 SmokeTest] $rev:$openejbrev:$tckrev - ${passed#* }/${failed#* }/${errors#* }"
+    subject="[Jetty $TCK_BRANCH_ID SmokeTest] $rev:$openejbrev:$tckrev - ${passed#* }/${failed#* }/${errors#* }"
   else
-    subject="[Jetty $1 SmokeTest] Passed"
+    subject="[Jetty $TCK_BRANCH_ID SmokeTest] Passed"
   fi
 
   send_mail "$subject" "geronimo-tck@geronimo.apache.org"
 
 # Run tomcat tests.
   echo "========= Tomcat TCK Test ========" >> tomcat-$tckLog
-  echo "Geronimo $1 at $rev" >> tomcat-$tckLog
+  echo "Geronimo $TCK_BRANCH at $rev" >> tomcat-$tckLog
   if [ "$BUILD_OPENEJB" = "true" ]
   then
      echo "OpenEJB trunk at $openejbrev" >> tomcat-$tckLog
@@ -116,9 +118,9 @@
 
   if [[ $failed != " 0"   ||  $errors != " 0" ||  $ERROR != " 0" ]]
   then
-    subject="[Tomcat $1 SmokeTest] $rev:$openejbrev:$tckrev - ${passed#* }/${failed#* }/${errors#* }"
+    subject="[Tomcat $TCK_BRANCH_ID SmokeTest] $rev:$openejbrev:$tckrev - ${passed#* }/${failed#* }/${errors#* }"
   else
-    subject="[Tomcat $1 SmokeTest] Passed"
+    subject="[Tomcat $TCK_BRANCH_ID SmokeTest] Passed"
   fi
 
   send_mail "$subject" "geronimo-tck@geronimo.apache.org"
@@ -127,7 +129,7 @@
 # Build failed. Mail build results.
 
   cat $tckLog >> tck.log
-  subject="[TCK $1 Build Failed] $rev:$tckrev"
+  subject="[TCK $TCK_BRANCH_ID Build Failed] $rev:$tckrev"
   send_mail "$subject" "geronimo-tck@geronimo.apache.org"
 
 fi