diff options
| author | teor <teor@torproject.org> | 2019-10-18 18:00:00 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-10-20 19:26:59 +1000 |
| commit | 012c44538ce15a3e45d6cdea0935062bdcaf5bf4 (patch) | |
| tree | c15e3ffe3f7068bf538326352729ae5ebf9d1b8f /src | |
| parent | e2280d6f849ea6e00fccc704e91d48a2f6924135 (diff) | |
| download | tor-012c44538ce15a3e45d6cdea0935062bdcaf5bf4.tar.gz tor-012c44538ce15a3e45d6cdea0935062bdcaf5bf4.zip | |
test: Skip test scripts that require the relay module
When tor is built without the relay module.
Part of 32123.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/test/test_key_expiration.sh | 5 | ||||
| -rwxr-xr-x | src/test/test_keygen.sh | 5 | ||||
| -rwxr-xr-x | src/test/test_zero_length_keys.sh | 5 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/test/test_key_expiration.sh b/src/test/test_key_expiration.sh index 54abb4a2fa..9d42c1cc4c 100755 --- a/src/test/test_key_expiration.sh +++ b/src/test/test_key_expiration.sh @@ -28,6 +28,11 @@ else TOR_BINARY="${TESTING_TOR_BINARY}" fi +if "$TOR_BINARY" --list-modules | grep -q "relay: no"; then + echo "This test requires the relay module. Skipping." >&2 + exit 77 +fi + if [ $# -ge 1 ]; then dflt=0 else diff --git a/src/test/test_keygen.sh b/src/test/test_keygen.sh index cbdfd1909c..57df888274 100755 --- a/src/test/test_keygen.sh +++ b/src/test/test_keygen.sh @@ -28,7 +28,10 @@ else TOR_BINARY="${TESTING_TOR_BINARY}" fi - +if "$TOR_BINARY" --list-modules | grep -q "relay: no"; then + echo "This test requires the relay module. Skipping." >&2 + exit 77 +fi if [ $# -ge 1 ]; then dflt=0 diff --git a/src/test/test_zero_length_keys.sh b/src/test/test_zero_length_keys.sh index 84ca513b0a..eeabab352d 100755 --- a/src/test/test_zero_length_keys.sh +++ b/src/test/test_zero_length_keys.sh @@ -1,6 +1,11 @@ #!/bin/sh # Check that tor regenerates keys when key files are zero-length +if "${builddir:-.}/src/app/tor" --list-modules | grep -q "relay: no"; then + echo "This test requires the relay module. Skipping." >&2 + exit 77 +fi + exitcode=0 "${SHELL:-sh}" "${abs_top_srcdir:-.}/src/test/zero_length_keys.sh" "${builddir:-.}/src/app/tor" -z || exitcode=1 |