test/parseconf: Add basic parsing tests

And document the "%include" behaviour. Closes 32450.
jessfraz · Nov 11, 2019 · 2d651f4 · 2d651f4
1 parent f6c9ca3
commit 2d651f4
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 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
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.