summaryrefslogtreecommitdiff
path: root/test/scripts/0000-Basic
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2022-02-27 14:27:04 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2022-02-28 12:01:33 +0000
commit703cc8957f4f367364b6a13c16afb1e971299278 (patch)
tree067767ed0f766bd29d74abdd1b79d245877fc8c2 /test/scripts/0000-Basic
parentfc057b9e8d3cbccb97a3044bda7faa0271670583 (diff)
Testsuite: fix for ndbm
Diffstat (limited to 'test/scripts/0000-Basic')
-rw-r--r--test/scripts/0000-Basic/00373
-rw-r--r--test/scripts/0000-Basic/01352
-rw-r--r--test/scripts/0000-Basic/02112
-rw-r--r--test/scripts/0000-Basic/02644
-rw-r--r--test/scripts/0000-Basic/05122
5 files changed, 7 insertions, 6 deletions
diff --git a/test/scripts/0000-Basic/0037 b/test/scripts/0000-Basic/0037
index ccf8f84b8..f602cad78 100644
--- a/test/scripts/0000-Basic/0037
+++ b/test/scripts/0000-Basic/0037
@@ -132,7 +132,8 @@ vacation message
exim -odi filter-vdefaults
Subject: should give rise to 2nd vacation message
****
-sudo rm DIR/test-mail/.vacation DIR/test-mail/.vacation.msg
+sudo rm -f DIR/test-mail/.vacation DIR/test-mail/.vacation.dir DIR/test-mail/.vacation.pag DIR/test-mail/.vacation.db
+sudo rm DIR/test-mail/.vacation.msg
#
exim -bF DIR/aux-fixed/TESTNUM.f-5 </dev/null
****
diff --git a/test/scripts/0000-Basic/0135 b/test/scripts/0000-Basic/0135
index f8f661a43..2c90357ce 100644
--- a/test/scripts/0000-Basic/0135
+++ b/test/scripts/0000-Basic/0135
@@ -15,7 +15,7 @@ exim -odi -q
****
# Remove so that next message does not arrive before
# the time of first failure.
-sudo rm DIR/spool/db/retry
+sudo rm DIR/spool/db/retry*
exim -odq -f '<>' b@known.ex
test 2
.
diff --git a/test/scripts/0000-Basic/0211 b/test/scripts/0000-Basic/0211
index c27a7ebf3..1621619c8 100644
--- a/test/scripts/0000-Basic/0211
+++ b/test/scripts/0000-Basic/0211
@@ -66,7 +66,7 @@ Test message 2
#
exim -z "Test: reject ehlo, then close (late, giving time for HELO)"
****
-sudo rm DIR/spool/db/retry
+sudo rm DIR/spool/db/retry*
server PORT_S
220 Connected OK
EHLO
diff --git a/test/scripts/0000-Basic/0264 b/test/scripts/0000-Basic/0264
index 2b97ad4f6..e4d517164 100644
--- a/test/scripts/0000-Basic/0264
+++ b/test/scripts/0000-Basic/0264
@@ -28,7 +28,7 @@ exim -q
exim -Mrm $msg1 $msg2
****
# Using a router with preconditions (local_parts, here) should get an address-retry record
-sudo rm DIR/spool/db/retry
+sudo rm DIR/spool/db/retry*
exim -odi r4.a@outside
****
dump retry
@@ -41,7 +41,7 @@ exim -odi r5.a@r5domain.ex
exim -Mrm $msg1 $msg2 $msg3
****
# Using a router with no non-domain preconditions, first should write a domain-retry record.
-sudo rm DIR/spool/db/retry
+sudo rm DIR/spool/db/retry*
exim -odi rz.a@outside
****
dump retry
diff --git a/test/scripts/0000-Basic/0512 b/test/scripts/0000-Basic/0512
index c33e0adba..99581a3c6 100644
--- a/test/scripts/0000-Basic/0512
+++ b/test/scripts/0000-Basic/0512
@@ -6,7 +6,7 @@ exim -odi userx
sleep 2
exim -d-all+transport -qf
****
-sudo rm spool/db/retry
+sudo rm spool/db/retry*
exim -odi userx
****
sleep 2