In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/f8c6801b81163debebd01aab796519234a5935d4?hp=86bc91c076cf0fc70861c7eaa41f2e20151bd92f>
- Log ----------------------------------------------------------------- commit f8c6801b81163debebd01aab796519234a5935d4 Author: Craig A. Berry <[email protected]> Date: Mon Jul 30 19:29:39 2012 -0500 Most magic.t tests can actually run on VMS. Only the one that clears %ENV is a problem. M t/op/magic.t commit bf1be224ac1c0c0c14db1b93586af8b137de753a Author: Craig A. Berry <[email protected]> Date: Mon Jul 30 19:26:40 2012 -0500 Correct skip count in magic.t after 613c63b465. M t/op/magic.t ----------------------------------------------------------------------- Summary of changes: t/op/magic.t | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/t/op/magic.t b/t/op/magic.t index c6c796d..03487b0 100644 --- a/t/op/magic.t +++ b/t/op/magic.t @@ -69,6 +69,8 @@ sub env_is { # cmd.exe will echo 'variable=value' but 4nt will echo just the value # -- Nikola Knezevic like `set $key`, qr/^(?:\Q$key\E=)?\Q$val\E$/, $desc; + } elsif ($Is_VMS) { + is `write sys\$output f\$trnlnm("\Q$key\E")`, "$val\n", $desc; } else { is `echo \$\Q$key\E`, "$val\n", $desc; } @@ -76,7 +78,10 @@ sub env_is { END { # On VMS, environment variable changes are peristent after perl exits - delete $ENV{'FOO'} if $Is_VMS; + if ($Is_VMS) { + delete $ENV{'FOO'}; + delete $ENV{'__NoNeSuCh'}; + } } eval '$ENV{"FOO"} = "hi there";'; # check that ENV is inited inside eval @@ -595,12 +600,12 @@ SKIP: { # ^^^^^^^^^ New tests go here ^^^^^^^^^ SKIP: { - skip("%ENV manipulations fail or aren't safe on $^O", 4) - if $Is_VMS || $Is_Dos; + skip("%ENV manipulations fail or aren't safe on $^O", 19) + if $Is_Dos; SKIP: { - skip("clearing \%ENV is not safe when running under valgrind") - if $ENV{PERL_VALGRIND}; + skip("clearing \%ENV is not safe when running under valgrind or on VMS") + if $ENV{PERL_VALGRIND} || $Is_VMS; $PATH = $ENV{PATH}; $PDL = $ENV{PERL_DESTRUCT_LEVEL} || 0; -- Perl5 Master Repository
