You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/03/12 06:46:33 UTC

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

Author: gawor
Date: Tue Mar 11 22:46:32 2008
New Revision: 636207

URL: http://svn.apache.org/viewvc?rev=636207&view=rev
Log:
prefix functions to prevent collisions

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

Modified: geronimo/gbuild/daily_build_scripts/samples.sh
URL: http://svn.apache.org/viewvc/geronimo/gbuild/daily_build_scripts/samples.sh?rev=636207&r1=636206&r2=636207&view=diff
==============================================================================
--- geronimo/gbuild/daily_build_scripts/samples.sh (original)
+++ geronimo/gbuild/daily_build_scripts/samples.sh Tue Mar 11 22:46:32 2008
@@ -28,7 +28,7 @@
 MAIL_FILE=$TEST_DIR/$BRANCH_DIR/mail.txt
 MAIL_LOG=$TEST_DIR/$BRANCH_DIR/mail.sample.log
 
-function send_mail() {
+function samples_send_mail() {
    subject=$1
    mailto=$2
 
@@ -54,7 +54,7 @@
   subject="[Samples $SAMPLES_BRANCH]: SVN checkout failed"
   echo "SVN checkout failed." > $MAIL_LOG
 
-  send_mail "$subject" "$ADMIN_ADDR"
+  samples_send_mail "$subject" "$ADMIN_ADDR"
   exit
 fi
 

Modified: geronimo/gbuild/daily_build_scripts/tck.sh
URL: http://svn.apache.org/viewvc/geronimo/gbuild/daily_build_scripts/tck.sh?rev=636207&r1=636206&r2=636207&view=diff
==============================================================================
--- geronimo/gbuild/daily_build_scripts/tck.sh (original)
+++ geronimo/gbuild/daily_build_scripts/tck.sh Tue Mar 11 22:46:32 2008
@@ -32,7 +32,7 @@
 TCK_BRANCH_ID=$1
 TCK_BRANCH=$2
 
-function send_mail() {
+function tck_send_mail() {
    subject=$1
    mailto=$2
 
@@ -94,7 +94,7 @@
     subject="[Jetty $TCK_BRANCH SmokeTest] Passed"
   fi
 
-  send_mail "$subject" "geronimo-tck@geronimo.apache.org"
+  tck_send_mail "$subject" "geronimo-tck@geronimo.apache.org"
 
 # Run tomcat tests.
   echo "========= Tomcat TCK Test ========" >> tomcat-$tckLog
@@ -123,14 +123,14 @@
     subject="[Tomcat $TCK_BRANCH SmokeTest] Passed"
   fi
 
-  send_mail "$subject" "geronimo-tck@geronimo.apache.org"
+  tck_send_mail "$subject" "geronimo-tck@geronimo.apache.org"
 
 else
 # Build failed. Mail build results.
 
   cat $tckLog >> tck.log
   subject="[TCK $TCK_BRANCH Build Failed] $rev:$tckrev"
-  send_mail "$subject" "geronimo-tck@geronimo.apache.org"
+  tck_send_mail "$subject" "geronimo-tck@geronimo.apache.org"
 
 fi