[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.2.10-20-g2b065d3



The following commit has been merged in the master branch:
commit 9f879a079ab49e6fc81a6f380145f44ae6f1fee4
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date:   Fri May 8 22:24:17 2009 +0100

    Correctly separate output of the test scripts from the changes tests.
    
    This was inadvertantly broken when the script was re-ordered to run the
    scripts first of all.

diff --git a/t/runtests b/t/runtests
index 05dddb6..2963087 100755
--- a/t/runtests
+++ b/t/runtests
@@ -130,8 +130,6 @@ my $prev;
 
 # --- Run all test scripts
 
-$prev = $prev || scalar(@tests);
-@tests = ();
 if ($singletest) {
     my $script = "$TESTSET/scripts/$singletest.t";
     if (-f $script) {
@@ -143,7 +141,7 @@ if ($singletest) {
     }
     @tests = ("$TESTSET/scripts");
 }
-print "\n" if ($prev and @tests);
+
 if (@tests) {
     print "Test scripts:\n";
     if (system('prove', '-I', "$LINTIAN_ROOT/lib", @tests) != 0) {
@@ -151,10 +149,14 @@ if (@tests) {
 	$status = 1;
     }
     $tests_run++;
+
+    print "\n";
 }
 
 # --- Run all changes tests
 
+$prev = scalar(@tests);
+@tests = ();
 if ($singletest) {
     my $test = $singletest;
     $test =~ s/\.changes$//;
@@ -186,7 +188,7 @@ for (@tests) {
 
 # --- Run all debs tests
 
-$prev = scalar(@tests);
+$prev = $prev || scalar(@tests);
 @tests = ();
 if ($singletest) {
     my $test = $singletest;

-- 
Debian package checker


Reply to: