diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-07 11:25:54 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-07 11:25:54 -0500 |
| commit | fe0bfbf755de7aff7dfbf4db11fce4f78c0b5950 (patch) | |
| tree | 53e1e8f2d97ac3d374f0ec86359dc6576ce8a121 | |
| parent | c8bcbf5ac2d61d1befdf2333bffe9d6a09a800ea (diff) | |
| parent | e7ade23f9723f55a504ebd8279cbadf0aca108c6 (diff) | |
| download | tor-fe0bfbf755de7aff7dfbf4db11fce4f78c0b5950.tar.gz tor-fe0bfbf755de7aff7dfbf4db11fce4f78c0b5950.zip | |
Merge branch 'maint-0.2.9' into release-0.2.9
| -rw-r--r-- | src/test/test_options.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/test/test_options.c b/src/test/test_options.c index 0eada98cb2..6770c16140 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -1076,21 +1076,27 @@ test_options_validate__transproxy(void *ignored) "TransPort 127.0.0.1:123\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); - tt_assert(!msg); + if (msg) { + TT_DIE(("Expected NULL but got '%s'", msg)); + } #endif #if defined(__FreeBSD_kernel__) || defined( DARWIN ) || defined(__NetBSD__) 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); tt_int_op(ret, OP_EQ, -1); - tt_assert(!msg); + if (msg) { + TT_DIE(("Expected NULL but got '%s'", msg)); + } #endif #if defined(__OpenBSD__) tdata = get_options_test_data("TransProxyType pf-divert\n" "TransPort 127.0.0.1:123\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); - tt_assert(!msg); + if (msg) { + TT_DIE(("Expected NULL but got '%s'", msg)); + } #endif // Assert that a test has run for some TransProxyType |