PR: 2102

[openssl.git] / test / tpkcs7d.com

diff --git a/test/tpkcs7d.com b/test/tpkcs7d.com
index 08d33eaa69024a9df9e3960487f48a666b908d11..22f0d0b2c5fd95d927ad084248e190ccea02f015 100644 (file)
--- a/test/tpkcs7d.com
+++ b/test/tpkcs7d.com
@@ -1,7 +1,9 @@
 $! TPKCS7.COM  --  Tests pkcs7 keys
 $
 $      __arch := VAX
-$      if f$getsyi("cpu") .ge. 128 then __arch := AXP
+$      if f$getsyi("cpu") .ge. 128 then -
+          __arch := f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
+$      if __arch .eqs. "" then __arch := UNK
 $      exe_dir := sys$disk:[-.'__arch'.exe.apps]
 $
 $      cmd := mcr 'exe_dir'openssl pkcs7
@@ -10,7 +12,12 @@ $    t := pkcs7-1.pem
 $      if p1 .nes. "" then t = p1
 $
 $      write sys$output "testing PKCS7 conversions (2)"
-$      copy 't' fff.p
+$      if f$search("fff.*") .nes "" then delete fff.*;*
+$      if f$search("ff.*") .nes "" then delete ff.*;*
+$      if f$search("f.*") .nes "" then delete f.*;*
+$      convert/fdl=sys$input: 't' fff.p
+RECORD
+       FORMAT STREAM_LF
 $
 $      write sys$output "p -> d"
 $      'cmd' -in fff.p -inform p -outform d -out f.d
@@ -34,9 +41,9 @@ $     write sys$output "p -> p"
 $      'cmd' -in f.p -inform p -outform p -out ff.p3
 $      if $severity .ne. 1 then exit 3
 $
-$      difference/output=nl: f.p ff.p1
+$      backup/compare f.p ff.p1
 $      if $severity .ne. 1 then exit 3
-$      difference/output=nl: f.p ff.p3
+$      backup/compare f.p ff.p3
 $      if $severity .ne. 1 then exit 3
 $
 $      delete f.*;*,ff.*;*,fff.*;*