tor

commit 83fa962c1af086a72c0a0ef1a9df12032e9a73ac
parent 876b3e277555cff8e51102ef62d6133f9e4677ac
Author: teor <teor@torproject.org>
Date:   Mon, 23 Sep 2019 12:29:25 +1000

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:
A
src/test/conf_examples/include_bug_31408/expected
 | 
2
++
A
src/test/conf_examples/include_bug_31408/included/01_nickname.inc
 | 
1
+
A
src/test/conf_examples/include_bug_31408/included/02_no_configs.inc
 | 
3
+++
A
src/test/conf_examples/include_bug_31408/torrc
 | 
2
++

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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,2 @@
+%include "included"
+ORPort 31408