diff options
| author | teor <teor@torproject.org> | 2019-09-23 12:29:25 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-09-24 11:10:50 +1000 |
| commit | 83fa962c1af086a72c0a0ef1a9df12032e9a73ac (patch) | |
| tree | 85c6e1c449fce4923dc3ceadebeaec10b4c98816 /src/test/conf_examples | |
| parent | 876b3e277555cff8e51102ef62d6133f9e4677ac (diff) | |
| download | tor-83fa962c1af086a72c0a0ef1a9df12032e9a73ac.tar.gz tor-83fa962c1af086a72c0a0ef1a9df12032e9a73ac.zip | |
test: a file with no config options, at the end of an %include directory
(The file must contain whitespace or comments to trigger the bug.)
Regression test for 31408.
Diffstat (limited to 'src/test/conf_examples')
4 files changed, 8 insertions, 0 deletions
diff --git a/src/test/conf_examples/include_bug_31408/expected b/src/test/conf_examples/include_bug_31408/expected new file mode 100644 index 0000000000..2e822f1a78 --- /dev/null +++ b/src/test/conf_examples/include_bug_31408/expected @@ -0,0 +1,2 @@ +Nickname test31408 +ORPort 31408 diff --git a/src/test/conf_examples/include_bug_31408/included/01_nickname.inc b/src/test/conf_examples/include_bug_31408/included/01_nickname.inc new file mode 100644 index 0000000000..508dd89a35 --- /dev/null +++ b/src/test/conf_examples/include_bug_31408/included/01_nickname.inc @@ -0,0 +1 @@ +Nickname test31408 diff --git a/src/test/conf_examples/include_bug_31408/included/02_no_configs.inc b/src/test/conf_examples/include_bug_31408/included/02_no_configs.inc new file mode 100644 index 0000000000..140e927f19 --- /dev/null +++ b/src/test/conf_examples/include_bug_31408/included/02_no_configs.inc @@ -0,0 +1,3 @@ +# Bug 31048 is triggered when the last file in a config directory: +# * contains no configuration options, +# * but is non-empty: that is, it contains comments or whitespace. diff --git a/src/test/conf_examples/include_bug_31408/torrc b/src/test/conf_examples/include_bug_31408/torrc new file mode 100644 index 0000000000..a42685e93c --- /dev/null +++ b/src/test/conf_examples/include_bug_31408/torrc @@ -0,0 +1,2 @@ +%include "included" +ORPort 31408 |