Testsuite: handle non-exim-writable testcase spoolfiles

diff --git a/test/confs/0910 b/test/confs/0910
index 3e754c071d599c2a009d34e52186e0a4a939fd69..941486be42042ff7af5737c113e94dbea50c5c85 100644 (file)
--- a/test/confs/0910
+++ b/test/confs/0910
@@ -1,3 +1,3 @@
 keep_environment =
 tls_advertise_hosts =
-spool_directory = DIR/aux-fixed/0910
+spool_directory = DIR/tmp

diff --git a/test/confs/1100 b/test/confs/1100
index 48f8c2029978d3e9b59d6bcf32783069599eaf67..654a26e6becf1dfbc37913bbe7cf5ce9cfb4eae4 100644 (file)
--- a/test/confs/1100
+++ b/test/confs/1100
@@ -1,4 +1,4 @@
 keep_environment =
 tls_advertise_hosts =
 log_file_path = DIR/spool/log/%slog
-spool_directory = DIR/aux-fixed/1100
+spool_directory = DIR/tmp

diff --git a/test/scripts/0000-Basic/0910 b/test/scripts/0000-Basic/0910
index 5487842c9c16bdf9984ce8b3e5c24d981645a99a..cfca092d80ce46e61a0e6075ef0b6b272e8f7179 100644 (file)
--- a/test/scripts/0000-Basic/0910
+++ b/test/scripts/0000-Basic/0910
@@ -1,2 +1,6 @@
 # Properly handle lines after very long ones from -H file
+mkdir -p DIR/tmp/input
+cp DIR/aux-fixed/TESTNUM/input/* DIR/tmp/input/
+sudo chmod 666 DIR/tmp/input/*
 exim -Mset 1i3FVM-0008QX-DU -be '$body_linecount'
+sudo rm -fr DIR/tmp

diff --git a/test/scripts/1100-Basic-TLS/1100 b/test/scripts/1100-Basic-TLS/1100
index d993eb62a33168f18ba9351f0f74c46c97ec841f..fd83237b14480c4d4054f27c08c7f92fb83f1687 100644 (file)
--- a/test/scripts/1100-Basic-TLS/1100
+++ b/test/scripts/1100-Basic-TLS/1100
@@ -1,2 +1,6 @@
 # Check for trailing backslash bug CVE-2019-15846
+mkdir -p DIR/tmp/input
+cp DIR/aux-fixed/TESTNUM/input/* DIR/tmp/input/
+sudo chmod 666 DIR/tmp/input/*
 exim -Mset 1i2t1o-0000cD-CV -be '$tls_in_peerdn'
+sudo rm -fr DIR/tmp

diff --git a/test/scripts/5650-OCSP-GnuTLS/5653 b/test/scripts/5650-OCSP-GnuTLS/5653
deleted file mode 100644 (file)
index 55cea8b..0000000
--- a/test/scripts/5650-OCSP-GnuTLS/5653
+++ /dev/null
@@ -1,23 +0,0 @@
-# OCSP stapling, server, multiple chain-element OCSP
-#
-#
-#
-exim -z '1: Server sends good staple on request, to client requiring RSA auth'
-****
-#
-exim -d+all -bd -oX PORT_D -DSERVER=server
-****
-exim -odf \
-  -DOPT=NONE:+SIGN-RSA-SHA256:+VERS-TLS-ALL:+ECDHE-RSA:+DHE-RSA:+RSA:+CIPHER-ALL:+MAC-ALL:+COMP-NULL:+CURVE-ALL:+CTYPE-X509 \
-  -DCERT=DIR/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem \
-  rsa.auth@test.ex
-Subject: test
-
-.
-****
-killdaemon
-#
-#
-#
-#
-no_msglog_check