From b83823bd386eb32cd37b8087429ff58fd21d0f2e Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Tue, 22 Sep 2015 11:30:11 +0100
Subject: Testsuite: move regex testcase to Content-scanning section

---
 test/confs/0568 | 57 --------------------------------------------------------
 test/confs/4010 | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 test/confs/4015 |  1 +
 3 files changed, 58 insertions(+), 58 deletions(-)
 delete mode 100644 test/confs/0568
 mode change 120000 => 100644 test/confs/4010
 create mode 120000 test/confs/4015

(limited to 'test/confs')

diff --git a/test/confs/0568 b/test/confs/0568
deleted file mode 100644
index fb1ec5d6e..000000000
--- a/test/confs/0568
+++ /dev/null
@@ -1,57 +0,0 @@
-# Exim test configuration 0568:  ACL regex=
-
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-
-
-# ----- Main settings -----
-
-acl_smtp_rcpt = check_rcpt
-acl_smtp_data = check_data
-acl_not_smtp  = check_data
-
-
-# ----- ACL -----
-
-begin acl
-
-check_rcpt:
-  accept
-
-check_data:
-  warn     regex   = \N(THIS\s((\w+)\s)?REGEX)\N
-           message = X-Regex: Regex matched <$regex1> <$regex3>
-
-  warn     condition = ${if !eq{$h_fakereject:}{}}
-           control   = fakereject
-
-  warn     condition = ${if !eq{$h_fakedefer:}{}}
-           control   = fakedefer
-
-  accept
-
-# ----- Routers -----
-
-begin routers
-
-r1:
-  driver = accept
-  transport = t1
-
-# ----- Transports -----
-
-begin transports
-
-t1:
-  driver = appendfile
-  file = DIR/test-mail/$local_part
-  user = CALLER
-
-
-# End
diff --git a/test/confs/4010 b/test/confs/4010
deleted file mode 120000
index eb8888460..000000000
--- a/test/confs/4010
+++ /dev/null
@@ -1 +0,0 @@
-4009
\ No newline at end of file
diff --git a/test/confs/4010 b/test/confs/4010
new file mode 100644
index 000000000..fb1ec5d6e
--- /dev/null
+++ b/test/confs/4010
@@ -0,0 +1,57 @@
+# Exim test configuration 0568:  ACL regex=
+
+exim_path = EXIM_PATH
+host_lookup_order = bydns
+primary_hostname = myhost.test.ex
+rfc1413_query_timeout = 0s
+spool_directory = DIR/spool
+log_file_path = DIR/spool/log/%slog
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+
+
+# ----- Main settings -----
+
+acl_smtp_rcpt = check_rcpt
+acl_smtp_data = check_data
+acl_not_smtp  = check_data
+
+
+# ----- ACL -----
+
+begin acl
+
+check_rcpt:
+  accept
+
+check_data:
+  warn     regex   = \N(THIS\s((\w+)\s)?REGEX)\N
+           message = X-Regex: Regex matched <$regex1> <$regex3>
+
+  warn     condition = ${if !eq{$h_fakereject:}{}}
+           control   = fakereject
+
+  warn     condition = ${if !eq{$h_fakedefer:}{}}
+           control   = fakedefer
+
+  accept
+
+# ----- Routers -----
+
+begin routers
+
+r1:
+  driver = accept
+  transport = t1
+
+# ----- Transports -----
+
+begin transports
+
+t1:
+  driver = appendfile
+  file = DIR/test-mail/$local_part
+  user = CALLER
+
+
+# End
diff --git a/test/confs/4015 b/test/confs/4015
new file mode 120000
index 000000000..eb8888460
--- /dev/null
+++ b/test/confs/4015
@@ -0,0 +1 @@
+4009
\ No newline at end of file
-- 
cgit v1.2.3