perl_588-27368.patch

   1 Change 27368 by rgs@stencil on 2006/03/03 15:45:32
   2
   3         Subject: [PATCH] Re: [perl #38657] -d:Foo=bar broke in 5.8.8
   4         From: Jarkko Hietaniemi <jhietaniemi@gmail.com>
   5         Date: Thu, 02 Mar 2006 20:21:26 +0200
   6         Message-ID: <440737A6.4060606@gmail.com>
   7
   8 Affected files ...
   9
  10 ... //depot/perl/t/lib/Devel/switchd.pm#3 edit
  11 ... //depot/perl/t/run/switchd.t#4 edit
  12
  13 Differences ...
  14
  15 --- t/lib/Devel/switchd.pm.dist 2006-03-02 20:02:52.000000000 +0200
  16 +++ t/lib/Devel/switchd.pm      2006-03-02 20:12:59.000000000 +0200
  17 @@ -1,6 +1,8 @@
  18  package Devel::switchd;
  19  use strict; BEGIN { } # use strict; BEGIN { ... } to incite [perl #21890]
  20 +sub import { print "import<@_>;" }
  21  package DB;
  22 -sub DB { print join(",", caller), ";" }
  23 +sub DB { print "DB<", join(",", caller), ">;" }
  24 +sub sub { print "sub<$DB::sub>;"; goto &$DB::sub }
  25  1;
  26
  27 --- t/run/switchd.t.dist        2006-03-02 19:59:03.000000000 +0200
  28 +++ t/run/switchd.t     2006-03-02 20:17:18.000000000 +0200
  29 @@ -7,7 +7,9 @@
  30
  31  require "./test.pl";
  32
  33 -plan(tests => 1);
  34 +# This test depends on t/lib/Devel/switchd.pm.
  35 +
  36 +plan(tests => 2);
  37
  38  my $r;
  39  my @tmpfiles = ();
  40 @@ -34,7 +36,14 @@
  41      $r = runperl(
  42                  switches => [ '-Ilib', '-d:switchd' ],
  43                  progfile => $filename,
  44 +                args => ['3'],
  45                 );
  46 -    like($r, qr/^main,swdtest.tmp,9;Foo,swdtest.tmp,5;Foo,swdtest.tmp,6;Foo,swdtest.tmp,6;Bar,swdtest.tmp,2;Bar,swdtest.tmp,2;Bar,swdtest.tmp,2;$/i);
  47 +    like($r, qr/^sub<Devel::switchd::import>;import<Devel::switchd>;DB<main,swdtest.tmp,9>;sub<Foo::foo>;DB<Foo,swdtest.tmp,5>;DB<Foo,swdtest.tmp,6>;DB<Foo,swdtest.tmp,6>;sub<Bar::bar>;DB<Bar,swdtest.tmp,2>;sub<Bar::bar>;DB<Bar,swdtest.tmp,2>;sub<Bar::bar>;DB<Bar,swdtest.tmp,2>;$/);
  48 +    $r = runperl(
  49 +                switches => [ '-Ilib', '-d:switchd=a,42' ],
  50 +                progfile => $filename,
  51 +                args => ['4'],
  52 +               );
  53 +    like($r, qr/^sub<Devel::switchd::import>;import<Devel::switchd a 42>;DB<main,swdtest.tmp,9>;sub<Foo::foo>;DB<Foo,swdtest.tmp,5>;DB<Foo,swdtest.tmp,6>;DB<Foo,swdtest.tmp,6>;sub<Bar::bar>;DB<Bar,swdtest.tmp,2>;sub<Bar::bar>;DB<Bar,swdtest.tmp,2>;sub<Bar::bar>;DB<Bar,swdtest.tmp,2>;$/);
  54  }
  55