Testsuite: move perl-dependent testcases

diff --git a/test/confs/0615 b/test/confs/0615
deleted file mode 100644 (file)
index 86ecee1..0000000
--- a/test/confs/0615
+++ /dev/null
@@ -1,7 +0,0 @@
-# exim test configuration 0615
-exim_path = EXIM_PATH
-tls_advertise_hosts =
-spool_directory = DIR/spool
-perl_startup = $| = 1; \
-       print "Environment visible in Perl:\n"; \
-       print map { "$_=$ENV{$_}\n" } sort keys %ENV;

diff --git a/test/confs/0616 b/test/confs/0616
deleted file mode 100644 (file)
index 7962d97..0000000
--- a/test/confs/0616
+++ /dev/null
@@ -1,8 +0,0 @@
-# exim test configuration 0616
-exim_path = EXIM_PATH
-keep_environment = ^FOO\d : BAR
-add_environment = ADDED1=added1 : ADDED2=added2
-tls_advertise_hosts =
-perl_startup = $| = 1; \
-       print "Environment visible in Perl:\n"; \
-       print map { "$_=$ENV{$_}\n" } sort keys %ENV;

diff --git a/test/confs/3001 b/test/confs/3001
new file mode 100644 (file)
index 0000000..86ecee1
--- /dev/null
+++ b/test/confs/3001
@@ -0,0 +1,7 @@
+# exim test configuration 0615
+exim_path = EXIM_PATH
+tls_advertise_hosts =
+spool_directory = DIR/spool
+perl_startup = $| = 1; \
+       print "Environment visible in Perl:\n"; \
+       print map { "$_=$ENV{$_}\n" } sort keys %ENV;

diff --git a/test/confs/3002 b/test/confs/3002
new file mode 100644 (file)
index 0000000..7962d97
--- /dev/null
+++ b/test/confs/3002
@@ -0,0 +1,8 @@
+# exim test configuration 0616
+exim_path = EXIM_PATH
+keep_environment = ^FOO\d : BAR
+add_environment = ADDED1=added1 : ADDED2=added2
+tls_advertise_hosts =
+perl_startup = $| = 1; \
+       print "Environment visible in Perl:\n"; \
+       print map { "$_=$ENV{$_}\n" } sort keys %ENV;

diff --git a/test/scripts/0000-Basic/0615 b/test/scripts/0000-Basic/0615
deleted file mode 100644 (file)
index c49a5f3..0000000
--- a/test/scripts/0000-Basic/0615
+++ /dev/null
@@ -1,13 +0,0 @@
-# Environment
-# settings
-FOO=foo FOO1=foo1 FOO2=foo2 BAR=bar BAR1=bar1 BAR2=bar2 exim -bP keep_environment add_environment
-****
-# result via -bP environment
-FOO=foo FOO1=foo1 FOO2=foo2 BAR=bar BAR1=bar1 BAR2=bar2 exim -bP environment
-****
-# result via -n -bP environment
-FOO=foo FOO1=foo1 FOO2=foo2 BAR=bar BAR1=bar1 BAR2=bar2 exim -n -bP environment
-****
-# result via perl_at_start
-FOO=foo FOO1=foo1 FOO2=foo2 BAR=bar BAR1=bar1 BAR2=bar2 exim -ps -be ''
-***

diff --git a/test/scripts/0000-Basic/0616 b/test/scripts/0000-Basic/0616
deleted file mode 120000 (symlink)
index 122707d..0000000
--- a/test/scripts/0000-Basic/0616
+++ /dev/null
@@ -1 +0,0 @@
-0615
\ No newline at end of file

diff --git a/test/scripts/3000-Perl/3001 b/test/scripts/3000-Perl/3001
new file mode 100644 (file)
index 0000000..c49a5f3
--- /dev/null
+++ b/test/scripts/3000-Perl/3001
@@ -0,0 +1,13 @@
+# Environment
+# settings
+FOO=foo FOO1=foo1 FOO2=foo2 BAR=bar BAR1=bar1 BAR2=bar2 exim -bP keep_environment add_environment
+****
+# result via -bP environment
+FOO=foo FOO1=foo1 FOO2=foo2 BAR=bar BAR1=bar1 BAR2=bar2 exim -bP environment
+****
+# result via -n -bP environment
+FOO=foo FOO1=foo1 FOO2=foo2 BAR=bar BAR1=bar1 BAR2=bar2 exim -n -bP environment
+****
+# result via perl_at_start
+FOO=foo FOO1=foo1 FOO2=foo2 BAR=bar BAR1=bar1 BAR2=bar2 exim -ps -be ''
+***

diff --git a/test/scripts/3000-Perl/3002 b/test/scripts/3000-Perl/3002
new file mode 120000 (symlink)
index 0000000..6fc99cf
--- /dev/null
+++ b/test/scripts/3000-Perl/3002
@@ -0,0 +1 @@
+3001
\ No newline at end of file

diff --git a/test/stdout/0615 b/test/stdout/0615
deleted file mode 100644 (file)
index 58d5d0e..0000000
--- a/test/stdout/0615
+++ /dev/null
@@ -1,4 +0,0 @@
-keep_environment = 
-add_environment = 
-Environment visible in Perl:
-

diff --git a/test/stdout/0616 b/test/stdout/0616
deleted file mode 100644 (file)
index 8ba67bb..0000000
--- a/test/stdout/0616
+++ /dev/null
@@ -1,19 +0,0 @@
-keep_environment = ^FOO\d : BAR
-add_environment = ADDED1=added1 : ADDED2=added2
-ADDED1=added1
-ADDED2=added2
-BAR=bar
-FOO1=foo1
-FOO2=foo2
-ADDED1
-ADDED2
-BAR
-FOO1
-FOO2
-Environment visible in Perl:
-ADDED1=added1
-ADDED2=added2
-BAR=bar
-FOO1=foo1
-FOO2=foo2
-

diff --git a/test/stdout/3001 b/test/stdout/3001
new file mode 100644 (file)
index 0000000..58d5d0e
--- /dev/null
+++ b/test/stdout/3001
@@ -0,0 +1,4 @@
+keep_environment = 
+add_environment = 
+Environment visible in Perl:
+

diff --git a/test/stdout/3002 b/test/stdout/3002
new file mode 100644 (file)
index 0000000..8ba67bb
--- /dev/null
+++ b/test/stdout/3002
@@ -0,0 +1,19 @@
+keep_environment = ^FOO\d : BAR
+add_environment = ADDED1=added1 : ADDED2=added2
+ADDED1=added1
+ADDED2=added2
+BAR=bar
+FOO1=foo1
+FOO2=foo2
+ADDED1
+ADDED2
+BAR
+FOO1
+FOO2
+Environment visible in Perl:
+ADDED1=added1
+ADDED2=added2
+BAR=bar
+FOO1=foo1
+FOO2=foo2
+