Loop in S_init_perllib(), only calling S_incpush*() with INCPUSH_ADD_OLD_VERS

[p5sagit/p5-mst-13.2.git] / t / run / switchd.t

diff --git a/t/run/switchd.t b/t/run/switchd.t
index 160ea99..921b966 100644 (file)
--- a/t/run/switchd.t
+++ b/t/run/switchd.t
@@ -5,15 +5,15 @@ BEGIN {
     @INC = qw(../lib lib);
 }
 
-require "./test.pl";
+BEGIN { require "./test.pl"; }
 
-plan(tests => 1);
+# This test depends on t/lib/Devel/switchd.pm.
+
+plan(tests => 2);
 
 my $r;
-my @tmpfiles = ();
-END { unlink @tmpfiles }
 
-my $filename = 'swdtest.tmp';
+my $filename = tempfile();
 SKIP: {
        open my $f, ">$filename"
            or skip( "Can't write temp file $filename: $!" );
@@ -29,12 +29,18 @@ package main;
 Foo::foo(3);
 __SWDTEST__
     close $f;
-    push @tmpfiles, $filename;
     $| = 1; # Unbufferize.
     $r = runperl(
-                switches => [ '-Ilib', '-d:switchd' ],
+                switches => [ '-Ilib', '-f', '-d:switchd' ],
+                progfile => $filename,
+                args => ['3'],
+               );
+    like($r, qr/^sub<Devel::switchd::import>;import<Devel::switchd>;DB<main,$::tempfile_regexp,9>;sub<Foo::foo>;DB<Foo,$::tempfile_regexp,5>;DB<Foo,$::tempfile_regexp,6>;DB<Foo,$::tempfile_regexp,6>;sub<Bar::bar>;DB<Bar,$::tempfile_regexp,2>;sub<Bar::bar>;DB<Bar,$::tempfile_regexp,2>;sub<Bar::bar>;DB<Bar,$::tempfile_regexp,2>;$/);
+    $r = runperl(
+                switches => [ '-Ilib', '-f', '-d:switchd=a,42' ],
                 progfile => $filename,
+                args => ['4'],
                );
-    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);
+    like($r, qr/^sub<Devel::switchd::import>;import<Devel::switchd a 42>;DB<main,$::tempfile_regexp,9>;sub<Foo::foo>;DB<Foo,$::tempfile_regexp,5>;DB<Foo,$::tempfile_regexp,6>;DB<Foo,$::tempfile_regexp,6>;sub<Bar::bar>;DB<Bar,$::tempfile_regexp,2>;sub<Bar::bar>;DB<Bar,$::tempfile_regexp,2>;sub<Bar::bar>;DB<Bar,$::tempfile_regexp,2>;$/);
 }