* 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 356220c3b23eeafefaf1435fb28a50fae4cbe52a..3af6c840339fe4b6bfb71137f5529637a7b7d193 100644 (file)
--- 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 bc1aa6ed1466cc9a9e7f1ea2e6fb7d493675b097..72671f085728cbff01d24522ae10ba914d4cdaf9 100755 (executable)
--- 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 189ff1c1c64638feb4e5e85746bed363ab576f9b..7339ed5cef4e1491f61504b6976b136f763179ea 100755 (executable)
--- 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 601c4cf02321e84544314504cb13ef1c1f9298fb..35f813c4e7e04132134d2b6e90bac188ddbb9a7b 100755 (executable)
--- 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 37c4766ff68b07f91ecefcd857f561576c12e8c0..0d7a6e62b974a8896e033d84e3657788277c5c48 100755 (executable)
--- 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