* adt-testreport-cronjob: renamed from hosts/cadmium/cronjob

* adt-testreport-runloop: copyright message.

diff --git a/Makefile b/Makefile
index 7f23a2ceb872bbdc928a31058e70bd0a8dd9bdd0..9f5c45ccbd1468bcc8c6589d1faba6ad3d00aa94 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,8 @@ programs =    virt-subproc/adt-virt-chroot \
                virt-subproc/adt-virt-null \
                runner/adt-run \
                runner/adt-testreport-onepackage \
-               runner/adt-testreport-runloop
+               runner/adt-testreport-runloop \
+               runner/adt-testreport-cronjob
 
 examples =     runner/onepackage-config \
                runner/ubuntu-config

diff --git a/debian/changelog b/debian/changelog
index a826be1778716c8f822f4ec225bdab0d91b8c3db..5922e7c50a143a3cf0de33ec0d6db6dc5d00ea14 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ autopkgtest (1.1.0~) unstable; urgency=low
   * adt-testreport-onepackage: many manpage improvements
   * adt-testreport-runloop: add to Makefile
   * hosts/* installed as examples with a big fat warning.
+  * adt-testreport-cronjob: renamed from hosts/cadmium/cronjob
+  * adt-testreport-runloop: copyright message.
 
  -- Ian Jackson <ian@davenant.greenend.org.uk>  Thu, 18 Oct 2007 17:17:31 +0100
 

diff --git a/hosts/cadmium/cronjob b/hosts/cadmium/cronjob
deleted file mode 100755 (executable)
index 3db7ded..0000000
--- a/hosts/cadmium/cronjob
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-cd adt-play
-exec >>overall.log 2>&1
-test -f go
-with-lock-ex -q nightly-lock \
- ./lalonde-nightly @onepackage-config max_test_count=100

diff --git a/hosts/cadmium/crontab b/hosts/cadmium/crontab
index 119497e30d314ee778ae0ff5f755155b634908b5..130821e08c28675e9c2b692ca0e7700eeaf3e24e 100644 (file)
--- a/hosts/cadmium/crontab
+++ b/hosts/cadmium/crontab
@@ -1,4 +1,4 @@
 # m h dom mon dow       command
-4-59/5 * * * *         adt-play/cronjob
-22 0 * * Mon           savelog -n7 adt-play/overall.log
+4-59/5 * * * *         autopkgtest/runner/adt-testreport-cronjob adt-play/onepackage-config
+22 0 * * Mon           savelog -n7 adt-play/var/log adt-play/var/overall.log
 58 7 * * *             adt-play/cleanup

diff --git a/runner/adt-testreport-cronjob b/runner/adt-testreport-cronjob
new file mode 100755 (executable)
index 0000000..9d35760
--- /dev/null
+++ b/runner/adt-testreport-cronjob
@@ -0,0 +1,14 @@
+#!/bin/bash
+#
+#  This script expects to be given one argument, the name
+#  of the config file which will set the PATH if necessary
+#  and cd to the appropriate playground.  This and all
+#  remaining arguments are passed to a-t-r.
+
+set -e
+. "$1"
+
+exec >>var/overall.log 2>&1
+test -f go
+with-lock-ex -q cronjob-lock \
+ adt-testreport-runloop "$@" max_test_count=100

diff --git a/runner/adt-testreport-runloop b/runner/adt-testreport-runloop
index 7f1f9de883651cc377a80146e7445a9f2d549112..97f5bb7511213899eb756b1f09d66a11ff696275 100644 (file)
--- a/runner/adt-testreport-runloop
+++ b/runner/adt-testreport-runloop
@@ -1,4 +1,25 @@
 #!/bin/bash
+# This file is part of autopkgtest
+# autopkgtest is a tool for testing Debian packages
+#
+# autopkgtest is Copyright (C) 2006 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+# See the file CREDITS for a full list of credits information (often
+# installed as /usr/share/doc/autopkgtest/CREDITS).
 
 set -e