From: Ian Jackson <ian@davenant.greenend.org.uk>
Date: Wed, 19 Sep 2007 13:42:43 +0000 (+0100)
Subject: * adt-testreport-onepackage: seddery the log to remove ctrl chars.
X-Git-Tag: converted-from-bzr~31^2~7
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c51faf1df979aa18bed6dc25606cfdb2f028e701;p=autopkgtest.git

* adt-testreport-onepackage: seddery the log to remove ctrl chars.
* hosts/chinstrap/update-suppressions: pass -S to curl.
* hosts/{chinstrap,cadmium}/install-on-*: use --ubuntu branch.
---

diff --git a/debian/changelog b/debian/changelog
index 356220c..3af6c84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+autopkgtest (1.0.8) gutsy; urgency=low
+
+  * adt-testreport-onepackage: seddery the log to remove ctrl chars.
+  * hosts/chinstrap/update-suppressions: pass -S to curl.
+  * hosts/{chinstrap,cadmium}/install-on-*: use --ubuntu branch.
+
+ --
+
 autopkgtest (1.0.7) gutsy; urgency=low
 
   * Build properly with debian/copyright.
diff --git a/hosts/cadmium/install-on-cadmium b/hosts/cadmium/install-on-cadmium
index bc1aa6e..72671f0 100755
--- a/hosts/cadmium/install-on-cadmium
+++ b/hosts/cadmium/install-on-cadmium
@@ -1,4 +1,4 @@
 #!/bin/sh
 set -e
-cd /work/AutomatedTesting/autopkgtest--main/
+cd /work/AutomatedTesting/autopkgtest--ubuntu/
 rsync -a . cadmium.buildd:autopkgtest/.
diff --git a/hosts/chinstrap/install-on-chinstrap b/hosts/chinstrap/install-on-chinstrap
index 189ff1c..7339ed5 100755
--- a/hosts/chinstrap/install-on-chinstrap
+++ b/hosts/chinstrap/install-on-chinstrap
@@ -1,4 +1,4 @@
 #!/bin/sh
 set -e
-cd /work/AutomatedTesting/autopkgtest--main/
+cd /work/AutomatedTesting/autopkgtest--ubuntu/
 rsync -a . chinstrap.ubuntu.com:autopkgtest/.
diff --git a/hosts/chinstrap/update-suppressions b/hosts/chinstrap/update-suppressions
index 601c4cf..35f813c 100755
--- a/hosts/chinstrap/update-suppressions
+++ b/hosts/chinstrap/update-suppressions
@@ -5,7 +5,7 @@ cd ${0%/*}
 url='https://launchpad.net/ubuntu/+bugs?field.searchtext=&orderby=-importance&field.status%3Alist=New&field.status%3Alist=Incomplete&field.status%3Alist=Confirmed&field.status%3Alist=Triaged&field.status%3Alist=In+Progress&field.status%3Alist=Fix+Committed&assignee_option=any&field.assignee=&field.bug_reporter=ian%2Bubuntu-autopkgtest&field.bug_contact=&field.bug_commenter=&field.subscriber=&field.status_upstream-empty-marker=1&field.omit_dupes.used=&field.has_patch.used=&field.tag=&field.has_cve.used=&search=Search'
 
 echo 'fetching'
-curl -s -k -o webpage "$url"
+curl -s -S -k -o webpage "$url"
 
 echo 'grepping'
 perl -ne '
@@ -17,7 +17,10 @@ nl -ba suppressions.new
 
 if ! test -s suppressions.new;
 then
-	echo >&2 'NO SUPPRESSIONS - PROBABLY WENT WRONG'
+	echo >&2 'NO SUPPRESSIONS - PROBABLY WENT WRONG
+
+webpage:'
+	cat webpage
 fi
 
 echo 'uploading'
diff --git a/runner/adt-testreport-onepackage b/runner/adt-testreport-onepackage
index 37c4766..0d7a6e6 100755
--- a/runner/adt-testreport-onepackage
+++ b/runner/adt-testreport-onepackage
@@ -47,12 +47,12 @@ printf >&3 "starting "
 rm -rf "$tmp"
 mkdir "$tmp"
 
->"$tmp"/_log
+>"$tmp"/_log_raw
 
 if $interactive; then
-	echo '(log diverted to stdout)' >>"$tmp"/_log
+	echo '(log diverted to stdout)' >>"$tmp"/_log_raw
 else
-	exec >>"$tmp"/_log
+	exec >>"$tmp"/_log_raw
 fi
 exec 4>&1
 
@@ -376,6 +376,15 @@ else
 	progress "fault ($ourx)."
 fi
 
+perl <"$tmp"/_log_raw >"$tmp"/_log -pe '
+	s/[^\012\040-\133\135-\176]/
+		$& eq "\t" ? "\\t" :
+		$& eq "\r" ? "\\r" :
+		$& eq "\b" ? "\\b" :
+		$& eq "\\" ? "\\\\" :
+		sprintf "\\x%02x", ord $&
+	/ge'
+
 if [ "x$email" = x ]; then
 	if $interactive; then
 		cat "$tmp"/_log >&2