Integrate Mainline

p4raw-id: //depot/perlio@18469

4 files changed, 12 insertions, 6 deletions

diff --git a/t/op/taint.t b/t/op/taint.t
index 4b8039cf6c..686354ed2f 100755
--- a/t/op/taint.t
+++ b/t/op/taint.t
@@ -904,7 +904,7 @@ else {
 }
 
 
-ok( ${^TAINT},  '$^TAINT is on' );
+ok( ${^TAINT} == 1, '$^TAINT is on' );
 
 eval { ${^TAINT} = 0 };
 ok( ${^TAINT},  '$^TAINT is not assignable' );
diff --git a/t/run/runenv.t b/t/run/runenv.t
index 9acad00edf..df4a778b4d 100644
--- a/t/run/runenv.t
+++ b/t/run/runenv.t
@@ -150,7 +150,7 @@ try({PERL5OPT => '-w -w'},
 
 try({PERL5OPT => '-t'},
     ['-e', 'print ${^TAINT}'],
-    '1',
+    '-1',
     '');
 
 try({PERLLIB => "foobar$Config{path_sep}42"},
diff --git a/t/run/switchI.t b/t/run/switchI.t
index fa74b9435e..fcd2dc00f2 100644
--- a/t/run/switchI.t
+++ b/t/run/switchI.t
@@ -11,9 +11,15 @@ BEGIN {
 }
 
 ok(grep { $_ eq 'Bla' } @INC);
-ok(grep { $_ eq 'Foo::Bar' } @INC);
+SKIP: {
+  skip 'Double colons not allowed in dir spec', 1 if $^O eq 'VMS';
+  ok(grep { $_ eq 'Foo::Bar' } @INC);
+}
 
 fresh_perl_is('print grep { $_ eq "Bla2" } @INC', 'Bla2',
 	      { switches => ['-IBla2'] }, '-I');
-fresh_perl_is('print grep { $_ eq "Foo::Bar2" } @INC', 'Foo::Bar2',
-	      { switches => ['-IFoo::Bar2'] }, '-I with colons');
+SKIP: {
+  skip 'Double colons not allowed in dir spec', 1 if $^O eq 'VMS';
+  fresh_perl_is('print grep { $_ eq "Foo::Bar2" } @INC', 'Foo::Bar2',
+	        { switches => ['-IFoo::Bar2'] }, '-I with colons');
+}
diff --git a/t/run/switcht.t b/t/run/switcht.t
index 869605ff95..f48124e70d 100644
--- a/t/run/switcht.t
+++ b/t/run/switcht.t
@@ -14,7 +14,7 @@ my $warning;
 local $SIG{__WARN__} = sub { $warning = join "\n", @_; };
 my $Tmsg = 'while running with -t switch';
 
-ok( ${^TAINT},      '${^TAINT} defined' );
+is( ${^TAINT}, -1, '${^TAINT} == -1' );
 
 my $out = `$Perl -le "print q(Hello)"`;
 is( $out, "Hello\n",                      '`` worked' );