diff options
| author | Steven Chamberlain <steven@pyro.eu.org> | 2016-02-29 14:15:20 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-03-11 10:01:25 -0500 |
| commit | db263442af565fde0d54398da7cc80a66469d273 (patch) | |
| tree | 230b9d7d76272fb7b0f76e9db0d3cc9922b93ceb /src/test | |
| parent | 82df3e70ac191a2a3cabf3574839e7561e00e370 (diff) | |
| download | tor-db263442af565fde0d54398da7cc80a66469d273.tar.gz tor-db263442af565fde0d54398da7cc80a66469d273.zip | |
enable and test transproxy on FreeBSD derivatives #18448
The transproxy feature is only enabled when __FreeBSD__ is defined, and
only regular FreeBSD does that. Change this to __FreeBSD_kernel__ which
is defined on derivatives as well.
This enables the relevant options/validate__transproxy test on FreeBSD
derivatives.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test_options.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/test_options.c b/src/test/test_options.c index ff1eb1855e..9458ade666 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -1058,7 +1058,7 @@ test_options_validate__transproxy(void *ignored) ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); -#if !defined(__FreeBSD__) && !defined( DARWIN ) +#if !defined(__FreeBSD_kernel__) && !defined( DARWIN ) tt_str_op(msg, OP_EQ, "ipfw is a FreeBSD-specificand OS X/Darwin-specific " "feature."); #else @@ -1086,7 +1086,7 @@ test_options_validate__transproxy(void *ignored) tt_int_op(ret, OP_EQ, -1); tt_assert(!msg); #endif -#if defined(__FreeBSD__) || defined( DARWIN ) +#if defined(__FreeBSD_kernel__) || defined( DARWIN ) tdata = get_options_test_data("TransProxyType ipfw\n" "TransPort 127.0.0.1:123\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); |