commit 01af3a55f41de991c0b59d5bf12c100c82829b47 parent 4462766d32eb3ee4505e300b116dcb7493bf3b0b Author: Nick Mathewson <nickm@torproject.org> Date: Mon, 11 Nov 2019 11:57:31 -0500 Merge remote-tracking branch 'tor-github/pr/1524' Diffstat:
11 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/test/conf_examples/empty_1/expected b/src/test/conf_examples/empty_1/expected diff --git a/src/test/conf_examples/empty_1/torrc b/src/test/conf_examples/empty_1/torrc diff --git a/src/test/conf_examples/empty_2/cmdline b/src/test/conf_examples/empty_2/cmdline diff --git a/src/test/conf_examples/empty_2/expected b/src/test/conf_examples/empty_2/expected diff --git a/src/test/conf_examples/empty_2/torrc b/src/test/conf_examples/empty_2/torrc diff --git a/src/test/conf_examples/empty_2/torrc.defaults b/src/test/conf_examples/empty_2/torrc.defaults diff --git a/src/test/conf_examples/empty_3/expected b/src/test/conf_examples/empty_3/expected diff --git a/src/test/conf_examples/empty_3/included/empty b/src/test/conf_examples/empty_3/included/empty diff --git a/src/test/conf_examples/empty_3/torrc b/src/test/conf_examples/empty_3/torrc @@ -0,0 +1 @@ +%include "included" diff --git a/src/test/conf_examples/empty_4/error b/src/test/conf_examples/empty_4/error @@ -0,0 +1 @@ +Unable to open configuration file +\ No newline at end of file diff --git a/src/test/test_parseconf.sh b/src/test/test_parseconf.sh @@ -28,6 +28,11 @@ # cmdline -- Optional. If present, it contains command-line arguments that # will be passed to Tor. # +# (included torrc files or directories) -- Optional. If present, and +# configured in the torrc* or cmdline, these files or directories are +# included. Include paths should be specified relative to the test case +# directory. +# # expected -- If this file is present, then it should be the expected result # of "--dump-config short" for this test case. Exactly one of # "expected" or "error" must be present, or the test will fail.