From: Richard Levitte <levitte@openssl.org>
Date: Sat, 26 Feb 2000 03:59:46 +0000 (+0000)
Subject: Make sure that all test files are gone before starting the tests, or
X-Git-Tag: OpenSSL_0_9_5beta2~23
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=921c9bd539346335390ecae6f12e9f5e6f5188e7;p=oweals%2Fopenssl.git

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 f25975f2fc..2e6ab2814d 100644
--- 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 ea75479cd5..c670f2bf5f 100644
--- 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 5a1fc478f3..3b66f2e0d0 100644
--- 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 997b870fe1..9e345937c6 100644
--- 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 1f76adcb41..7d4f8794a4 100644
--- 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 81f5e3bf4b..22c22c3aa9 100644
--- 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 c7d1ec441d..28add5eefd 100644
--- 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 a9ad69619c..bde23f9bb9 100644
--- 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 8b6adc19d5..985969c566 100644
--- 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"