* apps/makeapps.com: Forgot to end the check for /POINTER_SIZE=64=ARGV

with turning trapping back on.
* test/maketests.com: Do the same check for /POINTER_SIZE=64=ARGV
  here.
* test/clean-test.com: A new script for cleaning up.
This commit is contained in:
Richard Levitte 2011-03-20 14:02:20 +00:00
parent 8ecef24a66
commit f0d9196237
3 changed files with 58 additions and 1 deletions

View File

@ -620,6 +620,7 @@ $ DEASSIGN/USER SYS$OUTPUT
$ ELSE $ ELSE
$ POINTER_SIZE = POINTER_SIZE + "=ARGV" $ POINTER_SIZE = POINTER_SIZE + "=ARGV"
$ ENDIF $ ENDIF
$ SET ON
$ ARCHD = ARCH+ "_64" $ ARCHD = ARCH+ "_64"
$ LIB32 = "" $ LIB32 = ""
$ ELSE $ ELSE

35
test/clean_test.com Executable file
View File

@ -0,0 +1,35 @@
$!
$! Delete various test results files.
$!
$ def_orig = f$environment( "default")
$ proc = f$environment( "procedure")
$ proc_dev_dir = f$parse( "A.;", proc) - "A.;"
$!
$ on control_c then goto tidy
$ on error then goto tidy
$!
$ set default 'proc_dev_dir'
$!
$ files := *.cms;*, *.srl;*, *.ss;*, -
cms.err;*, cms.out;*, newreq.pem;*, -
p.txt-zlib-cipher;*, -
smtst.txt;*, testkey.pem;*, testreq.pem;*, -
test_*.err;*, test_*.out;*, -
.rnd;*
$!
$ delim = ","
$ i = 0
$ loop:
$ file = f$edit( f$element( i, delim, files), "trim")
$ if (file .eqs. delim) then goto loop_end
$ if (f$search( file) .nes. "") then -
delete 'p1' 'file'
$ i = i+ 1
$ goto loop
$ loop_end:
$!
$ tidy:
$
$ if (f$type( def_orig) .nes. "") then -
set default 'def_orig'
$!

View File

@ -536,7 +536,28 @@ $ POINTER_SIZE = "/POINTER_SIZE=32"
$ ELSE $ ELSE
$ IF (P5 .EQS. "64") $ IF (P5 .EQS. "64")
$ THEN $ THEN
$ POINTER_SIZE = "/POINTER_SIZE=64=ARGV" $ POINTER_SIZE = "/POINTER_SIZE=64"
$ SET NOON
$ DEFINE /USER SYS$OUTPUT NL:
$ DEFINE /USER SYS$ERROR NL:
$ CC /POINTER_SIZE=64=ARGV NL:
$ IF ($STATUS .AND. %X0FFF0000) .EQ. %X00030000
$ THEN
$ ! If we got here, it means DCL complained like this:
$ ! %DCL-W-NOVALU, value not allowed - remove value specification
$ ! \64=\
$ !
$ ! If the compiler was run, logicals defined in /USER would
$ ! have been deassigned automatically. However, when DCL
$ ! complains, they aren't, so we do it here (it might be
$ ! unnecessary, but just in case there will be another error
$ ! message further on that we don't want to miss)
$ DEASSIGN/USER SYS$ERROR
$ DEASSIGN/USER SYS$OUTPUT
$ ELSE
$ POINTER_SIZE = POINTER_SIZE + "=ARGV"
$ ENDIF
$ SET ON
$ ARCHD = ARCH+ "_64" $ ARCHD = ARCH+ "_64"
$ LIB32 = "" $ LIB32 = ""
$ ELSE $ ELSE