nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.9'

Browse Source
This commit is contained in:
Nick Mathewson 2016-12-07 11:26:02 -05:00
commit ab013719e5
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/test/test_options.c
View File

@ -1076,21 +1076,27 @@ test_options_validate__transproxy(void *ignored)
"TransPort 127.0.0.1:123\n"); "TransPort 127.0.0.1:123\n");
ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg);
tt_int_op(ret, OP_EQ, -1); tt_int_op(ret, OP_EQ, -1);
tt_assert(!msg); if (msg) {
TT_DIE(("Expected NULL but got '%s'", msg));
}
#endif #endif
#if defined(__FreeBSD_kernel__) || defined( DARWIN ) || defined(__NetBSD__) #if defined(__FreeBSD_kernel__) || defined( DARWIN ) || defined(__NetBSD__)
tdata = get_options_test_data("TransProxyType ipfw\n" tdata = get_options_test_data("TransProxyType ipfw\n"
"TransPort 127.0.0.1:123\n"); "TransPort 127.0.0.1:123\n");
ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg);
tt_int_op(ret, OP_EQ, -1); tt_int_op(ret, OP_EQ, -1);
tt_assert(!msg); if (msg) {
TT_DIE(("Expected NULL but got '%s'", msg));
}
#endif #endif
#if defined(__OpenBSD__) #if defined(__OpenBSD__)
tdata = get_options_test_data("TransProxyType pf-divert\n" tdata = get_options_test_data("TransProxyType pf-divert\n"
"TransPort 127.0.0.1:123\n"); "TransPort 127.0.0.1:123\n");
ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg);
tt_int_op(ret, OP_EQ, -1); tt_int_op(ret, OP_EQ, -1);
tt_assert(!msg); if (msg) {
TT_DIE(("Expected NULL but got '%s'", msg));
}
#endif #endif
// Assert that a test has run for some TransProxyType // Assert that a test has run for some TransProxyType