* adt-testreport-runloop: fix handling of test_classes (was xoptslist)

diff --git a/debian/changelog b/debian/changelog
index 7fa8c88e9311b585191941c0c2522dd675f38def..311e01161f33f4c64ca73a08c9cb5cb188df2f9e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ autopkgtest (1.1.0~) unstable; urgency=low
   * adt-testreport-cronjob: renamed from hosts/cadmium/cronjob
   * adt-testreport-runloop: copyright message.
   * cfg and adt-testreport-runloop: do not cd in config files.
+  * adt-testreport-runloop: fix handling of test_classes (was xoptslist)
   * hosts/cadmium/*, debian/rules: onepackage_config renamed to cfg.
 
  -- Ian Jackson <ian@davenant.greenend.org.uk>  Thu, 18 Oct 2007 17:17:31 +0100

diff --git a/runner/adt-testreport-runloop b/runner/adt-testreport-runloop
old mode 100644 (file)
new mode 100755 (executable)
index 97f5bb7..bda8da4
--- a/runner/adt-testreport-runloop
+++ b/runner/adt-testreport-runloop
@@ -45,7 +45,7 @@ else
        : ${testbed_check_path:=/dev/null}
 fi
 
-if [ "x$test_classes" = x]; then
+if [ "x$test_classes" = x ]; then
        : ${architecture:=`dpkg --print-architecture`}
        test_classes="source $distro, target=source : binary $distro, target=binary-$architecture"
 fi
@@ -70,9 +70,12 @@ while ($go_anyway || test -f go) && test $test_count -lt $max_test_count; do
 
        xopts="${test_classes%%:*}"
        xopts_opts="${xopts#*,}"
-       test_classes="${test_classes#*:}:$xopts"
        printf "considering (%s) " "$xopts_opts"
 
+       case "$test_classes" in
+       *:*)    test_classes="${test_classes#*:}:$xopts" ;;
+       esac
+
        anybroken=false
        for x in ${xopts%%,*}; do
                if test -f "stop-$x"; then