Merge branch 'master' of github.com:bagder/curl

curl · Nov 12, 2012 · cd5261e · cd5261e
2 parents 4b994e1 + e62ee60
commit cd5261e
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/tests/runtests.pl b/tests/runtests.pl
@@ -2865,7 +2865,10 @@ sub singletest {
         $teststat[$testnum]=$why; # store reason for this test case
 
         if(!$short) {
-            logmsg sprintf("test %03d SKIPPED: $why\n", $testnum);
+            if($skipped{$why} <= 3) {
+                # show only the first three skips for each reason
+                logmsg sprintf("test %03d SKIPPED: $why\n", $testnum);
+            }
         }
 
         timestampskippedevents($testnum);
@@ -4738,14 +4741,20 @@ sub displaylogs {
         # now show all test case numbers that had this reason for being
         # skipped
         my $c=0;
+        my $max = 9;
         for(0 .. scalar @teststat) {
             my $t = $_;
             if($teststat[$_] && ($teststat[$_] eq $r)) {
-                logmsg ", " if($c);
-                logmsg $_;
+                if($c < $max) {
+                    logmsg ", " if($c);
+                    logmsg $_;
+                }
                 $c++;
             }
         }
+        if($c > $max) {
+            logmsg " and ".($c-$max)." more";
+        }
         logmsg ")\n";
     }
 }