You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jh...@apache.org on 2017/02/13 01:15:03 UTC

svn commit: r1782715 - in /spamassassin/branches/3.4/masses/contrib/automasscheck-minimal: ./ automasscheck-minimal.sh

Author: jhardin
Date: Mon Feb 13 01:15:03 2017
New Revision: 1782715

URL: http://svn.apache.org/viewvc?rev=1782715&view=rev
Log:
Merge revision 1782713 from trunk:
Fix $JOBS (thx Tom Hendrikx)
Add log file symlinks (thx Kevin A. McGrail)

Modified:
    spamassassin/branches/3.4/masses/contrib/automasscheck-minimal/   (props changed)
    spamassassin/branches/3.4/masses/contrib/automasscheck-minimal/automasscheck-minimal.sh

Propchange: spamassassin/branches/3.4/masses/contrib/automasscheck-minimal/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Feb 13 01:15:03 2017
@@ -0,0 +1 @@
+/spamassassin/trunk/masses/contrib/automasscheck-minimal:1676603-1782714

Modified: spamassassin/branches/3.4/masses/contrib/automasscheck-minimal/automasscheck-minimal.sh
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/masses/contrib/automasscheck-minimal/automasscheck-minimal.sh?rev=1782715&r1=1782714&r2=1782715&view=diff
==============================================================================
--- spamassassin/branches/3.4/masses/contrib/automasscheck-minimal/automasscheck-minimal.sh (original)
+++ spamassassin/branches/3.4/masses/contrib/automasscheck-minimal/automasscheck-minimal.sh Mon Feb 13 01:15:03 2017
@@ -46,7 +46,7 @@ if [ "$1" == "--nightly" ]; then
         echo "Syncing $TYPE"
         rsync -qrz --delete rsync://rsync.spamassassin.org/tagged_builds/$TYPE/ $WORKDIR/$TYPE/
         retval=$?
-        JOBS=8
+        JOBS=${JOBS}
         LOGTYPE=
         RSYNCMOD=corpus
    elif date +%w |grep -q ^6; then
@@ -55,7 +55,7 @@ if [ "$1" == "--nightly" ]; then
         echo "Syncing $TYPE"
         rsync -qrz --delete rsync://rsync.spamassassin.org/tagged_builds/$TYPE/ $WORKDIR/$TYPE/
         retval=$?
-        JOBS=8
+        JOBS=${JOBS}
         NET=--net
         LOGTYPE=net-
         RSYNCMOD=corpus
@@ -65,7 +65,7 @@ if [ "$1" == "--nightly" ]; then
         echo "Syncing $TYPE"
         rsync -qrz --delete rsync://rsync.spamassassin.org/tagged_builds/$TYPE/ $WORKDIR/$TYPE/
         retval=$?
-        JOBS=8
+        JOBS=${JOBS}
         LOGTYPE=
         RSYNCMOD=corpus
     fi
@@ -92,7 +92,8 @@ run_masscheck() {
              "$@"
     LOGLIST="$LOGLIST ham-${LOGNAME} spam-${LOGNAME}"
     set +x
-
+    ln -s ham-${LOGNAME} ham.log
+    ln -s spam-${LOGNAME} spam.log
 }
 
 upload_results() {
@@ -131,6 +132,7 @@ else
 fi
 
 # Run
+JOBS=${JOBS:=8}
 setup_checktype $@
 mkdir -p $WORKDIR/$TYPE
 cd $WORKDIR/$TYPE