From: Craig A. Berry <craigberry@mac.com>
Date: Sat, 16 Oct 2004 12:15:02 +0000 (-0500)
Subject: test_harness tweak for VMS
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=20533b5ab7dd4e5ed429644a69a242f721deb78c;p=p5sagit%2Fp5-mst-13.2.git

test_harness tweak for VMS
From: "Craig A. Berry" <craigberry@mac.com>
Message-Id: <41715716.5000108@mac.com>

p4raw-id: //depot/perl@23377
---

diff --git a/vms/descrip_mms.template b/vms/descrip_mms.template
index ce7d817..4a86437 100644
--- a/vms/descrip_mms.template
+++ b/vms/descrip_mms.template
@@ -1277,11 +1277,13 @@ check : test
 	@ Continue
 
 test : all [.t.lib]vmsfspec.t [.t.lib]vms_dclsym.t [.t.lib]vms_stdio.t
-	- @[.VMS]Test.Com "$(E)" "$(__DEBUG__)" "TEST."
+	@ PERL_TEST_DRIVER == "TEST."
+	- @[.VMS]Test.Com "$(E)" "$(__DEBUG__)"
 	@ $(MINIPERL) -e "print ""Ran tests"";" > [.t]rantests.
 
 test_harness : all [.t.lib]vmsfspec.t [.t.lib]vms_dclsym.t [.t.lib]vms_stdio.t
-	- @[.VMS]Test.Com "$(E)" "$(__DEBUG__)" "HARNESS."
+	@ PERL_TEST_DRIVER == "harness."
+	- @[.VMS]Test.Com "$(E)" "$(__DEBUG__)"
 	@ $(MINIPERL) -e "print ""Ran tests"";" > [.t]rantests.
 
 # install ought not need a source, but it doesn't work if one's not
diff --git a/vms/test.com b/vms/test.com
index d92f64a..3c5b49e 100644
--- a/vms/test.com
+++ b/vms/test.com
@@ -19,8 +19,6 @@ $!
 $! Process arguments.  P1 is the file extension of the Perl images.
 $! P2, when not empty, indicates that we are testing a version of Perl built
 $! for the VMS debugger.  The other arguments are passed directly to t/TEST.
-$! P3 is the test target to use:
-$!    TEST. or harness.
 $!
 $   exe = ".Exe"
 $   If p1.nes."" Then exe = p1
@@ -42,9 +40,8 @@ $   ndbg = ""
 $   if p2.nes."" then dbg  = "dbg"
 $   if p2.nes."" then ndbg = "ndbg"
 $!
-$!  P3 - testfile
-$  testfile = "TEST."
-$  if p3.nes."" then testfile = p3
+$! Run using "TEST." unless something else (e.g. "harness.") was specified.
+$  If F$Type(PERL_TEST_DRIVER) .eqs. "" Then PERL_TEST_DRIVER == "TEST."
 $!
 $!  Make sure we are where we need to be.
 $   If F$Search("t.dir").nes.""
@@ -79,7 +76,7 @@ $   testdir = "Directory/NoHead/NoTrail/Column=1"
 $   PerlShr_filespec = f$parse("Sys$Disk:[-]''dbg'PerlShr''exe'")
 $   Define 'dbg'Perlshr 'PerlShr_filespec'
 $   If F$Mode() .nes. "INTERACTIVE" Then Define/Nolog PERL_SKIP_TTY_TEST 1
-$   MCR Sys$Disk:[]Perl. "-I[-.lib]" 'testfile' "''p4'" "''p5'" "''p6'" "''p7'"
+$   MCR Sys$Disk:[]Perl. "-I[-.lib]" 'PERL_TEST_DRIVER' "''p3'" "''p4'" "''p5'" "''p6'" "''p7'"
 $   goto wrapup
 $!
 $ Control_Y_exit: