diff options
| author | Kinsey Moore <kmoore@digium.com> | 2014-07-22 14:22:00 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2014-07-22 14:22:00 +0000 |
| commit | 9056c23bbd7247bc7b6f122382c84a759d64cef9 (patch) | |
| tree | 951f92904824094adc53be4a9d0e6980522f2bae /tests/test_config.c | |
| parent | 878db87fc09327b2116ecc291dde8595396dd19e (diff) | |
Fix more dev-mode build issues
........
Merged revisions 419129 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 419162 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 419163 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@419175 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'tests/test_config.c')
| -rw-r--r-- | tests/test_config.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/test_config.c b/tests/test_config.c index a8a83b2b0..a9a281ddc 100644 --- a/tests/test_config.c +++ b/tests/test_config.c @@ -883,19 +883,19 @@ AST_TEST_DEFINE(config_options_test) arr[3] = item_defaults; /* Test global and item against configs, global_defaults and item_defaults against defaults */ -#define NOT_EQUAL_FAIL(field) \ +#define NOT_EQUAL_FAIL(field, format) \ if (arr[x]->field != control->field) { \ - ast_test_status_update(test, "%s did not match: %d != %d with x = %d\n", #field, arr[x]->field, control->field, x); \ + ast_test_status_update(test, "%s did not match: " format " != " format " with x = %d\n", #field, arr[x]->field, control->field, x); \ res = AST_TEST_FAIL; \ } for (x = 0; x < 4; x++) { struct test_item *control = x < 2 ? &configs : &defaults; - NOT_EQUAL_FAIL(intopt); - NOT_EQUAL_FAIL(uintopt); - NOT_EQUAL_FAIL(boolopt); - NOT_EQUAL_FAIL(flags); - NOT_EQUAL_FAIL(customopt); + NOT_EQUAL_FAIL(intopt, "%d"); + NOT_EQUAL_FAIL(uintopt, "%u"); + NOT_EQUAL_FAIL(boolopt, "%d"); + NOT_EQUAL_FAIL(flags, "%u"); + NOT_EQUAL_FAIL(customopt, "%d"); if (fabs(arr[x]->doubleopt - control->doubleopt) > 0.001) { ast_test_status_update(test, "doubleopt did not match: %f vs %f on loop %d\n", arr[x]->doubleopt, control->doubleopt, x); res = AST_TEST_FAIL; |