You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2005/12/06 05:32:59 UTC

svn commit: r354300 - in /spamassassin/trunk: build/automc/run_nightly masses/rule-qa/corpus-nightly

Author: jm
Date: Mon Dec  5 20:32:56 2005
New Revision: 354300

URL: http://svn.apache.org/viewcvs?rev=354300&view=rev
Log:
more solaris port work

Modified:
    spamassassin/trunk/build/automc/run_nightly
    spamassassin/trunk/masses/rule-qa/corpus-nightly

Modified: spamassassin/trunk/build/automc/run_nightly
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/build/automc/run_nightly?rev=354300&r1=354299&r2=354300&view=diff
==============================================================================
--- spamassassin/trunk/build/automc/run_nightly (original)
+++ spamassassin/trunk/build/automc/run_nightly Mon Dec  5 20:32:56 2005
@@ -23,7 +23,9 @@
 
   (
     HOME=$dir
-    export HOME
+    PERL=/local/perl586/bin/perl
+    export HOME PERL
+
     # use bash to work around Solaris breakage
     bash $dir/svn/masses/rule-qa/corpus-nightly
   )

Modified: spamassassin/trunk/masses/rule-qa/corpus-nightly
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/masses/rule-qa/corpus-nightly?rev=354300&r1=354299&r2=354300&view=diff
==============================================================================
--- spamassassin/trunk/masses/rule-qa/corpus-nightly (original)
+++ spamassassin/trunk/masses/rule-qa/corpus-nightly Mon Dec  5 20:32:56 2005
@@ -6,6 +6,11 @@
 
 renice 10 -p $$
 
+# use $PERL from env if unset
+if [ "x${PERL:-}" = x ] ; then
+  PERL=perl
+fi
+
 set -x
 set -e
 RSYNC_PASSWORD=$password ; export RSYNC_PASSWORD
@@ -13,12 +18,12 @@
 TZ=UTC ; export TZ
 
 # ensure we're running after 0900 UTC
-if date | egrep -q '^... ... .. (08|10):'; then
+if date | egrep '^... ... .. (08|10):'; then
 	exit
 fi
 
 # day of week
-if date | egrep -q '^Sat' || [ "$1" = "net" ]; then
+if date | egrep '^Sat' || [ "$1" = "net" ]; then
 	net="net-"
 else
 	net=""
@@ -43,9 +48,9 @@
 set +e
 retry=0
 while true; do
-	killall -TERM svn
+	pkill -TERM svn
 	sleep 10
-	killall -KILL svn
+	pkill -KILL svn
 	if svn update -r $revision; then
 		break;
 	fi
@@ -59,7 +64,7 @@
 set -e
 
 # build
-perl Makefile.PL < /dev/null
+$PERL Makefile.PL < /dev/null
 make
 
 # call ext command, if required