* Set LANG to C by default for commands (eg builds and tests) run on

[autopkgtest.git] / runner / adt-testreport-onepackage

diff --git a/runner/adt-testreport-onepackage b/runner/adt-testreport-onepackage
index 9f1de64290f86f6a7fbc743eb2133d7d28406a7f..122abfb552a6e26d7670784894b9a63ed931c53c 100755 (executable)
--- a/runner/adt-testreport-onepackage
+++ b/runner/adt-testreport-onepackage
@@ -2,16 +2,9 @@
 
 set -e
 
-mirror=http://mirror.relativity.greenend.org.uk/mirror/ubuntu.good
-distro=feisty
-suite=main
 salt=''
 tmp=tmp
 var=var
-administrator_email=ian@davenant.greenend.org.uk
-maintainer_email_override="$administrator_email"
-salutation="Ian"
-from="$salutation Jackson <ian@davenant.greenend.org.uk>"
 rsync=rsync
 disable=true
 interactive=true
@@ -234,14 +227,15 @@ xrc adt-run --tmp-dir "$tp"/tmp                           \
  ---                                                   \
  adt-virt-xenlvm                                       \
        $adtvirt_extra_opts                             \
- --                                                    \
        --distro="$distro"                              \
+ --                                                    \
  2>&1 3>&- 4>&-
 
 printf >&3 "%s " $rc
 
 ourx=0
 upload=true
+: ${upload_if_notests:=false}
 extras=''
 
 case "$rc" in
@@ -250,7 +244,7 @@ case "$rc" in
 2)     summary='OK (some skipped)';            email=''
                                        upload=$upload_if_ok            ;;
 8)     summary='package declares no tests';    email=''
-                                       upload=false; extras='nt'       ;;
+                               upload=$upload_if_notests; extras='nt'  ;;
 4|6)   summary='test(s) failed!';      email="$maintainer_email"       ;;
 12)    summary='erroneous package!';   email="$maintainer_email"       ;;
 16)    summary='testbed failed!';      email="administrator_email"     ;;
@@ -261,6 +255,7 @@ progress "RESULTS $summary"
 
 if $upload; then
        progress "bundling"
+       printf "\n%s\n" "$summary" >>"$tmp"/_summary
        ln "$tmp"/_summary "$tp"/summary
 
        for odir in tmp out; do