From 3b558104ccfbe5d3cbad84ed8c394cf1d7aed045 Mon Sep 17 00:00:00 2001
From: Charles Bailey <bailey@newman.upenn.edu>
Date: Thu, 2 Mar 2000 04:04:52 +0000
Subject: [PATCH] MIscellaneous tweaks to test and driver (Charles Lane)

p4raw-id: //depot/vmsperl@5426
---
 t/pragma/warn/8signal |  2 +-
 t/pragma/warn/pp_sys  | 10 ++++++++++
 t/pragma/warnings.t   |  2 +-
 vms/test.com          |  6 +++---
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/t/pragma/warn/8signal b/t/pragma/warn/8signal
index 0be2d13..80e6033 100644
--- a/t/pragma/warn/8signal
+++ b/t/pragma/warn/8signal
@@ -13,6 +13,6 @@ use warnings FATAL => qw(deprecated) ;
 1 if 1 EQ 2 ;
 print "The End.\n" ;
 EXPECT
-Use of EQ is deprecated at - line 8.
 WARN -- Use of EQ is deprecated at - line 6.
 DIE -- Use of EQ is deprecated at - line 8.
+Use of EQ is deprecated at - line 8.
diff --git a/t/pragma/warn/pp_sys b/t/pragma/warn/pp_sys
index 5808536..cab1b60 100644
--- a/t/pragma/warn/pp_sys
+++ b/t/pragma/warn/pp_sys
@@ -195,6 +195,16 @@ syswrite() on closed filehandle main::STDIN at - line 6.
 (Are you trying to call syswrite() on dirhandle main::STDIN?)
 ########
 # pp_sys.c [pp_flock]
+use Config; 
+BEGIN { 
+  if ( $^O eq 'VMS' and ! $Config{d_flock}) {
+    print <<EOM ;
+SKIPPED
+# flock not present
+EOM
+    exit ;
+  } 
+}
 use warnings 'closed' ;
 close STDIN;
 flock STDIN, 8;
diff --git a/t/pragma/warnings.t b/t/pragma/warnings.t
index 9629c37..71fb0df 100644
--- a/t/pragma/warnings.t
+++ b/t/pragma/warnings.t
@@ -91,7 +91,7 @@ for (@prgs){
     # allow all tests to run when there are leaks
     $results =~ s/Scalars leaked: \d+\n//g;
     $expected =~ s/\n+$//;
-    my $prefix = ($results =~ s/^PREFIX\n//) ;
+    my $prefix = ($results =~ s#^PREFIX(\n|$)##) ;
     # any special options? (OPTIONS foo bar zap)
     my $option_regex = 0;
     if ($expected =~ s/^OPTIONS? (.+)\n//) {
diff --git a/vms/test.com b/vms/test.com
index 039d844..b1d270d 100644
--- a/vms/test.com
+++ b/vms/test.com
@@ -45,7 +45,7 @@ $   Delete/Log/NoConfirm Perl.;*
 $   Copy/Log/NoConfirm [-]'ndbg'Perl'exe' []Perl.
 $
 $!  Make the environment look a little friendlier to tests which assume Unix
-$   cat = "Type"
+$   cat == "Type"
 $   Macro/NoDebug/NoList/Object=Echo.Obj Sys$Input
 		.title echo
 		.psect data,wrt,noexe
@@ -88,7 +88,7 @@ $   Macro/NoDebug/NoList/Object=Echo.Obj Sys$Input
 		.end echo
 $   Link/NoMap/NoTrace/Exe=Echo.Exe Echo.Obj;
 $   Delete/Log/NoConfirm Echo.Obj;*
-$   echo = "$" + F$Parse("Echo.Exe")
+$   echo == "$" + F$Parse("Echo.Exe")
 $
 $!  And do it
 $   Show Process/Accounting
@@ -112,7 +112,7 @@ use Config;
 @libexcl=('db-btree.t','db-hash.t','db-recno.t',
           'gdbm.t','io_dup.t', 'io_pipe.t', 'io_poll.t', 'io_sel.t',
           'io_sock.t', 'io_unix.t',
-          'ndbm.t','odbm.t','open2.t','open3.t', 'ph.t', 'posix.t');
+          'ndbm.t','odbm.t','open2.t','open3.t', 'ph.t', 'posix.t', 'dprof.t');
 
 # Note: POSIX is not part of basic build, but can be built
 # separately if you're using DECC
-- 
2.7.4