From fb2f4f35ed5b255c27d380c799f38eb5d9219ca0 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian@davenant.greenend.org.uk>
Date: Tue, 21 Aug 2007 19:54:10 +0100
Subject: [PATCH] * adt-run: increase timeouts to 3ks for tests and 10ks for
 builds. * adt-testreport-onepackage: suppress repetitive emails. *
 hosts/cadmium/onepackage-config: change destination directory

---
 debian/changelog                 |  3 +++
 hosts/cadmium/onepackage-config  |  3 ++-
 runner/adt-run                   |  2 +-
 runner/adt-testreport-onepackage | 22 ++++++++++++++++++++++
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9e47285..675f6ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ autopkgtest (1.0.4) unstable; urgency=low
     Architecture: field corrected so package selection works properly.
   * adt-testreport-onepackage: use ln -f when installing summary.
   * hosts/cadmium/*: new directory for stuff on Canonical buildd.
+  * adt-run: increase timeouts to 3ks for tests and 10ks for builds.
+  * adt-testreport-onepackage: suppress repetitive emails.
+  * hosts/cadmium/onepackage-config: change destination directory
 
  --
 
diff --git a/hosts/cadmium/onepackage-config b/hosts/cadmium/onepackage-config
index 96de272..a99e8d0 100644
--- a/hosts/cadmium/onepackage-config
+++ b/hosts/cadmium/onepackage-config
@@ -9,7 +9,8 @@ from="$salutation Jackson <iwj@ubuntu.com>"
 disable=false
 desthttphead=http://autopkgtest.ubuntu.com/
 destrsynchead=/home/iwj/public_html
-destdirtail=autopkgtest-output/$distro
+destdirtail=autopkgtest-output
 adtvirt_extra_opts=--userv
 upload_if_ok=true
 upload_if_notests=true
+suppressrepeatedemails=true
diff --git a/runner/adt-run b/runner/adt-run
index e5a2c97..9578790 100755
--- a/runner/adt-run
+++ b/runner/adt-run
@@ -45,7 +45,7 @@ signal.signal(signal.SIGINT, signal.SIG_DFL) # undo stupid Python SIGINT thing
 tmpdir = None		# pathstring on host
 testbed = None		# Testbed
 errorcode = 0		# exit status that we are going to use
-timeouts = { 'short':10, 'install':900, 'test':600, 'build':3000 }
+timeouts = { 'short':10, 'install':900, 'test':3000, 'build':10000 }
 binaries = None		# Binaries (.debs we have registered)
 build_essential = ["build-essential"]
 
diff --git a/runner/adt-testreport-onepackage b/runner/adt-testreport-onepackage
index 3908e7c..f2f3e5d 100755
--- a/runner/adt-testreport-onepackage
+++ b/runner/adt-testreport-onepackage
@@ -9,6 +9,7 @@ rsync=rsync
 disable=true
 interactive=true
 target=source
+suppressrepeatedemails=false
 arch=`dpkg --print-architecture`
 
 for config in "$@"; do
@@ -259,6 +260,23 @@ progress "RESULTS $summary"
 if $upload; then
 	progress "bundling"
 	printf "\n%s\n" "$summary" >>"$tmp"/_summary
+
+	edest=${email%_email}
+	esummary="$var"/emailed/last-$pkg,$edest
+	if [ "x$edest" = x ]; then
+		printf >&3 "email-none "
+		rm -f "$var"/emailed/last-$pkg,*
+		esummary=''
+	elif $suppressrepeatedemails \
+	  && [ -f "$esummary" ] \
+	  && diff -u "$esummary" "$tmp"/_summary >"$var"/emailed/diff-$pkg; then
+		printf >&3 "email-suppressed $email "
+		email=''
+		esummary=''
+	else
+		cp "$tmp"/_summary "$esummary".new
+	fi
+
 	ln -f "$tmp"/_summary "$tp"/summary
 
 	for odir in tmp out; do
@@ -357,6 +375,10 @@ else
 		cat "$tmp"/_email >&2
 	else
 		sendmail -odi -oem -t -oi <"$tmp"/_email
+		if [ "x$esummary" != x ]; then
+			printf >&3 "email-recorded "
+			mv "$esummary".new "esummary"
+		fi
 	fi
 fi
 
-- 
2.30.2