Further tweaking for bad skip() usage.

See also e96513a2.

1 files changed, 7 insertions, 6 deletions

diff --git a/t/test.pl b/t/test.pl
index 0cfae31b98..92f732e4db 100644
--- a/t/test.pl
+++ b/t/test.pl
@@ -477,17 +477,18 @@ sub next_test {
 # be compatible with Test::More::skip().
 sub skip {
     my $why = shift;
-    my $n    = @_ ? shift : 1;
+    my $n   = @_ ? shift : 1;
     my $bad_swap;
     {
       local $^W = 0;
       $bad_swap = $why > 0 && $n == 0;
     }
-    if ($bad_swap) {
-      die qq[$0: expected skip(why, count), got skip($why, "$n")\n];
-    }
-    if (@_) {
-      die qq[$0: expected skip(why, count), got skip($why, "$n", @_)\n];
+    if ($bad_swap || @_) {
+      my $arg = "$why, '$n'";
+      if (@_) {
+        $arg .= join(", ", '', map { qq['$_'] } @_);
+      }
+      die qq[$0: expected skip(why, count), got skip($arg)\n];
     }
     for (1..$n) {
         _print "ok $test # skip $why\n";