diff options
| author | David Goulet <dgoulet@torproject.org> | 2020-05-19 15:18:17 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2020-05-19 15:18:17 -0400 |
| commit | ca13249dcc3e9974c35d6c29a2622a5c8d4cf32e (patch) | |
| tree | 3bd53bf55a8a7bc163067abfb5d3f16a98e974f7 /src/test | |
| parent | ee0fb69feef1becb836ffef86d2bc4dac4a89dbb (diff) | |
| parent | cce16a939c63892b4e7a132c0df93c103d177620 (diff) | |
| download | tor-ca13249dcc3e9974c35d6c29a2622a5c8d4cf32e.tar.gz tor-ca13249dcc3e9974c35d6c29a2622a5c8d4cf32e.zip | |
Merge branch 'tor-github/pr/1886'
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/conf_examples/empty_3/expected_log | 2 | ||||
| -rw-r--r-- | src/test/conf_examples/include_1/expected_log | 2 | ||||
| -rw-r--r-- | src/test/conf_examples/include_bug_31408/expected_log | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/test/conf_examples/empty_3/expected_log b/src/test/conf_examples/empty_3/expected_log index a42514f37f..e3f2365893 100644 --- a/src/test/conf_examples/empty_3/expected_log +++ b/src/test/conf_examples/empty_3/expected_log @@ -1 +1 @@ -Included configuration .*directory at recursion level 1.*included +Processing configuration path \".*included\" at recursion level 1\. diff --git a/src/test/conf_examples/include_1/expected_log b/src/test/conf_examples/include_1/expected_log index f95cad040d..0791a494d2 100644 --- a/src/test/conf_examples/include_1/expected_log +++ b/src/test/conf_examples/include_1/expected_log @@ -1 +1 @@ -Included configuration file .*at recursion level 2.*nested\.inc +Processing configuration path \".*nested\.inc\" at recursion level 2\. diff --git a/src/test/conf_examples/include_bug_31408/expected_log b/src/test/conf_examples/include_bug_31408/expected_log index a42514f37f..e3f2365893 100644 --- a/src/test/conf_examples/include_bug_31408/expected_log +++ b/src/test/conf_examples/include_bug_31408/expected_log @@ -1 +1 @@ -Included configuration .*directory at recursion level 1.*included +Processing configuration path \".*included\" at recursion level 1\. |