1 files changed, 5 insertions, 33 deletions

diff --git a/src/lib/libssl/test/testca.com b/src/lib/libssl/test/testca.com
index c670f2bf5f..ec7e56dad6 100644
--- a/src/lib/libssl/test/testca.com
+++ b/src/lib/libssl/test/testca.com
@@ -1,8 +1,9 @@
 $! TESTCA.COM
 $
 $       __arch := VAX
-$       if f$getsyi("cpu") .ge. 128 then __arch := AXP
-$       exe_dir := sys$disk:[-.'__arch'.exe.apps]
+$       if f$getsyi("cpu") .ge. 128 then -
+           __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
+$       if __arch .eqs. "" then __arch := UNK
 $
 $       openssl := mcr 'exe_dir'openssl
 $
@@ -11,7 +12,7 @@ $
 $       set noon
 $       if f$search("demoCA.dir") .nes. ""
 $       then
-$           call deltree [.demoCA]*.*
+$           @[-.util]deltree [.demoCA]*.*
 $           set file/prot=(S:RWED,O:RWED,G:RWED,W:RWED) demoCA.dir;*
 $           delete demoCA.dir;*
 $       endif
@@ -38,7 +39,7 @@ $	@[-.apps]CA.com -verify newcert.pem
 $       if $severity .ne. 1 then exit 3
 $
 $       set noon
-$       call deltree [.demoCA]*.*
+$       @[-.util]deltree [.demoCA]*.*
 $       set file/prot=(S:RWED,O:RWED,G:RWED,W:RWED) demoCA.dir;*
 $       delete demoCA.dir;*
 $       if f$search("newcert.pem") .nes. "" then delete newcert.pem;*
@@ -47,32 +48,3 @@ $	set on
 $!      #usage: CA -newcert|-newreq|-newca|-sign|-verify
 $
 $       exit
-$
-$ deltree: subroutine ! P1 is a name of a directory
-$       on control_y then goto dt_STOP
-$       on warning then goto dt_exit
-$       _dt_def = f$trnlnm("SYS$DISK")+f$directory()
-$       if f$parse(p1) .eqs. "" then exit
-$       set default 'f$parse(p1,,,"DEVICE")''f$parse(p1,,,"DIRECTORY")'
-$       p1 = f$parse(p1,,,"NAME") + f$parse(p1,,,"TYPE")
-$       _fp = f$parse(".DIR",p1)
-$ dt_loop:
-$       _f = f$search(_fp)
-$       if _f .eqs. "" then goto dt_loopend
-$       call deltree [.'f$parse(_f,,,"NAME")']*.*
-$       goto dt_loop
-$ dt_loopend:
-$       _fp = f$parse(p1,".;*")
-$       if f$search(_fp) .eqs. "" then goto dt_exit
-$       set noon
-$       set file/prot=(S:RWED,O:RWED,G:RWED,W:RWED) '_fp'
-$       set on
-$       delete/nolog '_fp'
-$ dt_exit:
-$       set default '_dt_def'
-$       exit
-$ dt_STOP:
-$       set default '_dt_def'
-$       stop/id=""
-$       exit
-$       endsubroutine