diff options
| author | teor <teor@torproject.org> | 2019-11-06 16:52:40 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-11-06 21:36:42 +1000 |
| commit | 22482fd45472525c5ebaf2e68880b61b7703cad3 (patch) | |
| tree | ead9834defa347f497d04a7fc20ad01027702530 /src/test/conf_examples | |
| parent | 85e566a6a0541b141b694152ac99912d3a349dca (diff) | |
| download | tor-22482fd45472525c5ebaf2e68880b61b7703cad3.tar.gz tor-22482fd45472525c5ebaf2e68880b61b7703cad3.zip | |
test/parseconf: Add support for optional library variants
test_parseconf.sh now supports:
* {error,expected}{,_lzma,_nss,_zstd}{,_no_dirauth,_no_relay_dirauth}
Or any combination of two or more optional libraries.
Closes ticket 32397.
Diffstat (limited to 'src/test/conf_examples')
| -rw-r--r-- | src/test/conf_examples/lzma_zstd_1/error | 1 | ||||
| -rw-r--r-- | src/test/conf_examples/lzma_zstd_1/error_lzma | 1 | ||||
| -rw-r--r-- | src/test/conf_examples/lzma_zstd_1/error_lzma_zstd | 1 | ||||
| -rw-r--r-- | src/test/conf_examples/lzma_zstd_1/error_zstd | 1 | ||||
| -rw-r--r-- | src/test/conf_examples/lzma_zstd_1/torrc | 4 | ||||
| -rw-r--r-- | src/test/conf_examples/nss_1/error | 1 | ||||
| -rw-r--r-- | src/test/conf_examples/nss_1/error_nss | 1 | ||||
| -rw-r--r-- | src/test/conf_examples/nss_1/torrc | 4 |
8 files changed, 14 insertions, 0 deletions
diff --git a/src/test/conf_examples/lzma_zstd_1/error b/src/test/conf_examples/lzma_zstd_1/error new file mode 100644 index 0000000000..a5531ca21e --- /dev/null +++ b/src/test/conf_examples/lzma_zstd_1/error @@ -0,0 +1 @@ +Tor 0.* running on .* with Libevent .*, .*, Zlib .*, Liblzma N/A, and Libzstd N/A diff --git a/src/test/conf_examples/lzma_zstd_1/error_lzma b/src/test/conf_examples/lzma_zstd_1/error_lzma new file mode 100644 index 0000000000..2947e5991b --- /dev/null +++ b/src/test/conf_examples/lzma_zstd_1/error_lzma @@ -0,0 +1 @@ +Tor 0.* running on .* with Libevent .*, .*, Zlib .*, Liblzma .*, and Libzstd N/A diff --git a/src/test/conf_examples/lzma_zstd_1/error_lzma_zstd b/src/test/conf_examples/lzma_zstd_1/error_lzma_zstd new file mode 100644 index 0000000000..e76e4357f8 --- /dev/null +++ b/src/test/conf_examples/lzma_zstd_1/error_lzma_zstd @@ -0,0 +1 @@ +Tor 0.* running on .* with Libevent .*, .*, Zlib .*, Liblzma .*, and Libzstd .*
\ No newline at end of file diff --git a/src/test/conf_examples/lzma_zstd_1/error_zstd b/src/test/conf_examples/lzma_zstd_1/error_zstd new file mode 100644 index 0000000000..c8b174423b --- /dev/null +++ b/src/test/conf_examples/lzma_zstd_1/error_zstd @@ -0,0 +1 @@ +Tor 0.* running on .* with Libevent .*, .*, Zlib .*, Liblzma N/A, and Libzstd .*
\ No newline at end of file diff --git a/src/test/conf_examples/lzma_zstd_1/torrc b/src/test/conf_examples/lzma_zstd_1/torrc new file mode 100644 index 0000000000..91a4656b77 --- /dev/null +++ b/src/test/conf_examples/lzma_zstd_1/torrc @@ -0,0 +1,4 @@ +# Deliberately bad options, to cause an error message +# But this test actually checks for the optional library list in tor's logs, +# not the error message +bad bad bad
\ No newline at end of file diff --git a/src/test/conf_examples/nss_1/error b/src/test/conf_examples/nss_1/error new file mode 100644 index 0000000000..32e8cfc2f8 --- /dev/null +++ b/src/test/conf_examples/nss_1/error @@ -0,0 +1 @@ +Tor 0.* running on .* with Libevent .*, OpenSSL .*, Zlib .*, Liblzma .*, and Libzstd .* diff --git a/src/test/conf_examples/nss_1/error_nss b/src/test/conf_examples/nss_1/error_nss new file mode 100644 index 0000000000..c0fe7b003c --- /dev/null +++ b/src/test/conf_examples/nss_1/error_nss @@ -0,0 +1 @@ +Tor 0.* running on .* with Libevent .*, NSS .*, Zlib .*, Liblzma .*, and Libzstd .* diff --git a/src/test/conf_examples/nss_1/torrc b/src/test/conf_examples/nss_1/torrc new file mode 100644 index 0000000000..91a4656b77 --- /dev/null +++ b/src/test/conf_examples/nss_1/torrc @@ -0,0 +1,4 @@ +# Deliberately bad options, to cause an error message +# But this test actually checks for the optional library list in tor's logs, +# not the error message +bad bad bad
\ No newline at end of file |