Make sure that all test files are gone before starting the tests, or

backup will complain about some version not existing.  Perhaps.

diff --git a/test/tcrl.com b/test/tcrl.com
index f25975f2fc63bea05566792f09cd8204071123a1..2e6ab2814d8f91e3e88123bed15f0d57ccd63eb0 100644 (file)
--- a/test/tcrl.com
+++ b/test/tcrl.com
@@ -10,6 +10,9 @@ $     t := testcrl.pem
 $      if p1 .nes. "" then t = p1
 $
 $      write sys$output "testing CRL conversions"
+$      if f$search("fff.*") .nes "" then delete fff.*;*
+$      if f$search("ff.*") .nes "" then delete ff.*;*
+$      if f$search("f.*") .nes "" then delete f.*;*
 $      copy 't' fff.p
 $
 $      write sys$output "p -> d"

diff --git a/test/testca.com b/test/testca.com
index ea75479cd5a60d2cc061b613de84ce4dee007fa4..c670f2bf5f7373564c87d3c743010c9ed19e372e 100644 (file)
--- a/test/testca.com
+++ b/test/testca.com
@@ -40,7 +40,9 @@ $
 $      set noon
 $      call deltree [.demoCA]*.*
 $      set file/prot=(S:RWED,O:RWED,G:RWED,W:RWED) demoCA.dir;*
-$      delete demoCA.dir;*,newcert.pem;*,newreq.pem;*
+$      delete demoCA.dir;*
+$      if f$search("newcert.pem") .nes. "" then delete newcert.pem;*
+$      if f$search("newcert.pem") .nes. "" then delete newreq.pem;*
 $      set on
 $!     #usage: CA -newcert|-newreq|-newca|-sign|-verify
 $

diff --git a/test/testenc.com b/test/testenc.com
index 5a1fc478f3ed5648d8430f1f531a77f02f90355b..3b66f2e0d0614f5de4ac0a88b01094c8d69eda03 100644 (file)
--- a/test/testenc.com
+++ b/test/testenc.com
@@ -8,8 +8,12 @@ $      testsrc := makefile.ssl
 $      test := p.txt
 $      cmd := mcr 'exe_dir'openssl
 $
+$      if f$search(test) .nes. "" then delete 'test';*
 $      copy 'testsrc' 'test'
 $
+$      if f$search(test+"-cipher") .nes. "" then delete 'test'-cipher;*
+$      if f$search(test+"-clear") .nes. "" then delete 'test'-clear;*
+$
 $      write sys$output "cat"
 $      'cmd' enc -in 'test' -out 'test'-cipher
 $      'cmd' enc -in 'test'-cipher -out 'test'-clear
@@ -30,6 +34,12 @@ $    open/read f 'test'-cipher-commands
 $ loop_cipher_commands:
 $      read/end=loop_cipher_commands_end f i
 $      write sys$output i
+$
+$      if f$search(test+"-"+i+"-cipher") .nes. "" then -
+               delete 'test'-'i'-cipher;*
+$      if f$search(test+"-"+i+"-clear") .nes. "" then -
+               delete 'test'-'i'-clear;*
+$
 $      'cmd' 'i' -bufsize 113 -e -k test -in 'test' -out 'test'-'i'-cipher
 $      'cmd' 'i' -bufsize 157 -d -k test -in 'test'-'i'-cipher -out 'test'-'i'-clear
 $      backup/compare 'test' 'test'-'i'-clear

diff --git a/test/tpkcs7.com b/test/tpkcs7.com
index 997b870fe15fa04d8b5dd5909da67beb701fac2b..9e345937c6e59e6e83ce53c47534cb3944ccaec6 100644 (file)
--- a/test/tpkcs7.com
+++ b/test/tpkcs7.com
@@ -10,6 +10,9 @@ $     t := testp7.pem
 $      if p1 .nes. "" then t = p1
 $
 $      write sys$output "testing PKCS7 conversions"
+$      if f$search("fff.*") .nes "" then delete fff.*;*
+$      if f$search("ff.*") .nes "" then delete ff.*;*
+$      if f$search("f.*") .nes "" then delete f.*;*
 $      copy 't' fff.p
 $
 $      write sys$output "p -> d"

diff --git a/test/tpkcs7d.com b/test/tpkcs7d.com
index 1f76adcb418591d26ee399c83c27454ce532dbe2..7d4f8794a4cbd0172d2b76a9e462672e376ead4e 100644 (file)
--- a/test/tpkcs7d.com
+++ b/test/tpkcs7d.com
@@ -10,6 +10,9 @@ $     t := pkcs7-1.pem
 $      if p1 .nes. "" then t = p1
 $
 $      write sys$output "testing PKCS7 conversions (2)"
+$      if f$search("fff.*") .nes "" then delete fff.*;*
+$      if f$search("ff.*") .nes "" then delete ff.*;*
+$      if f$search("f.*") .nes "" then delete f.*;*
 $      copy 't' fff.p
 $
 $      write sys$output "p -> d"

diff --git a/test/treq.com b/test/treq.com
index 81f5e3bf4b470c21988002ad278bcb34a41b3963..22c22c3aa9e48af6037c63d404c7e2dcc380fbce 100644 (file)
--- a/test/treq.com
+++ b/test/treq.com
@@ -10,6 +10,9 @@ $     t := testreq.pem
 $      if p1 .nes. "" then t = p1
 $
 $      write sys$output "testing req conversions"
+$      if f$search("fff.*") .nes "" then delete fff.*;*
+$      if f$search("ff.*") .nes "" then delete ff.*;*
+$      if f$search("f.*") .nes "" then delete f.*;*
 $      copy 't' fff.p
 $
 $      write sys$output "p -> d"

diff --git a/test/trsa.com b/test/trsa.com
index c7d1ec441dedd4b74868055e6873d94b11d768ce..28add5eefd090c994b7b67e7a06f0d417078d47d 100644 (file)
--- a/test/trsa.com
+++ b/test/trsa.com
@@ -10,6 +10,9 @@ $     t := testrsa.pem
 $      if p1 .nes. "" then t = p1
 $
 $      write sys$output "testing RSA conversions"
+$      if f$search("fff.*") .nes "" then delete fff.*;*
+$      if f$search("ff.*") .nes "" then delete ff.*;*
+$      if f$search("f.*") .nes "" then delete f.*;*
 $      copy 't' fff.p
 $
 $      write sys$output "p -> d"

diff --git a/test/tsid.com b/test/tsid.com
index a9ad69619c86106273d67f538740f78956e579e2..bde23f9bb973770d05c7a62dba0bfba5544d23e1 100644 (file)
--- a/test/tsid.com
+++ b/test/tsid.com
@@ -10,6 +10,9 @@ $     t := testsid.pem
 $      if p1 .nes. "" then t = p1
 $
 $      write sys$output "testing session-id conversions"
+$      if f$search("fff.*") .nes "" then delete fff.*;*
+$      if f$search("ff.*") .nes "" then delete ff.*;*
+$      if f$search("f.*") .nes "" then delete f.*;*
 $      copy 't' fff.p
 $
 $      write sys$output "p -> d"

diff --git a/test/tx509.com b/test/tx509.com
index 8b6adc19d5edffa5cf544866984565e26b1e27c1..985969c566f24d24d77d5e8f482a9774b12e8ea6 100644 (file)
--- a/test/tx509.com
+++ b/test/tx509.com
@@ -10,6 +10,9 @@ $     t := testx509.pem
 $      if p1 .nes. "" then t = p1
 $
 $      write sys$output "testing X509 conversions"
+$      if f$search("fff.*") .nes "" then delete fff.*;*
+$      if f$search("ff.*") .nes "" then delete ff.*;*
+$      if f$search("f.*") .nes "" then delete f.*;*
 $      copy 't' fff.p
 $
 $      write sys$output "p -> d"