diff options
| author | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-12-09 23:15:47 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2016-12-29 19:38:42 +0000 |
| commit | 29f678881018103cc2aec85bdb51ea5830cf2e37 (patch) | |
| tree | 31095e6e3dadcb6d087d81b6fcc2faaae90dc42d /test | |
| parent | 1e7290ef735e436c37682e1129ea607de2a55e51 (diff) | |
Allow relative file names in .include lines (Closes 1971)
Diffstat (limited to 'test')
| -rw-r--r-- | test/confs/0903 | 1 | ||||
| -rw-r--r-- | test/confs/0903./aaa | 1 | ||||
| -rw-r--r-- | test/confs/0903./bbb | 0 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0290 | 2 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0903 | 2 | ||||
| -rw-r--r-- | test/stdout/0903 | 7 |
6 files changed, 12 insertions, 1 deletions
diff --git a/test/confs/0903 b/test/confs/0903 new file mode 100644 index 000000000..017424e24 --- /dev/null +++ b/test/confs/0903 @@ -0,0 +1 @@ +.include confs/0903./aaa diff --git a/test/confs/0903./aaa b/test/confs/0903./aaa new file mode 100644 index 000000000..746f316bf --- /dev/null +++ b/test/confs/0903./aaa @@ -0,0 +1 @@ +.include bbb diff --git a/test/confs/0903./bbb b/test/confs/0903./bbb new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/test/confs/0903./bbb diff --git a/test/scripts/0000-Basic/0290 b/test/scripts/0000-Basic/0290 index f4b63aa8e..204fa1e1b 100644 --- a/test/scripts/0000-Basic/0290 +++ b/test/scripts/0000-Basic/0290 @@ -8,5 +8,5 @@ exim -DOPT -bP receive_timeout exim '-D OPT = receive_timeout = 4s ' -bP receive_timeout **** 1 -exim -DINC='.include non/absolute' -bP receive_timeout +exim -DINC='.include_if_exists non/absolute' -bP receive_timeout **** diff --git a/test/scripts/0000-Basic/0903 b/test/scripts/0000-Basic/0903 new file mode 100644 index 000000000..1bd510ae3 --- /dev/null +++ b/test/scripts/0000-Basic/0903 @@ -0,0 +1,2 @@ +# Test different variants of .includes +exim -bP config diff --git a/test/stdout/0903 b/test/stdout/0903 new file mode 100644 index 000000000..a7bda45dc --- /dev/null +++ b/test/stdout/0903 @@ -0,0 +1,7 @@ +# Exim Configuration (X) +# 1 "TESTSUITE/test-config" +# 1 "TESTSUITE/test-config" +# 1 "TESTSUITE/confs/0903./aaa" +# 1 "TESTSUITE/confs/0903./aaa" +# 1 "TESTSUITE/confs/0903./aaa" +# 1 "TESTSUITE/test-config" |