diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-07 11:26:02 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-07 11:26:02 -0500 |
| commit | ab013719e5f00e44c45d2bbc3bc54c8833321d82 (patch) | |
| tree | af21088230f7dc75e97b16ef47b5790afb21db21 /src/test | |
| parent | 1d45438ef03564b7af2f3a5b4b0e3ff7a9570a97 (diff) | |
| parent | e7ade23f9723f55a504ebd8279cbadf0aca108c6 (diff) | |
| download | tor-ab013719e5f00e44c45d2bbc3bc54c8833321d82.tar.gz tor-ab013719e5f00e44c45d2bbc3bc54c8833321d82.zip | |
Merge branch 'maint-0.2.9'
Diffstat (limited to 'src/test')
| -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 |