From 89caf5edcc99f5731e89bd51e6ffaad3ec11c304 Mon Sep 17 00:00:00 2001 From: Pavel Březina Date: Wed, 3 Aug 2011 09:15:52 +0200 Subject: New DEBUG facility - SSSDBG_UNRESOLVED changed from -1 to 0 Removed: SSS_UNRESOLVED_DEBUG_LEVEL (completely replaced with SSSDBG_UNRESOLVED) Added new macro: CONVERT_AND_SET_DEBUG_LEVEL(new_value) Changes unresolved debug level value (SSSDBG_UNRESOLVED) from -1 to 0 so DEBUG macro could be reduced by one condition. Anyway, it has a minor effect, every time you want to load debug_level from command line parameters, you have to use following pattern: /* Set debug level to invalid value so we can deside if -d 0 was used. */ debug_level = SSSDBG_INVALID; pc = poptGetContext(argv[0], argc, argv, long_options, 0); while((opt = poptGetNextOpt(pc)) != -1) { ... } CONVERT_AND_SET_DEBUG_LEVEL(debug_level); --- src/tests/debug-tests.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/tests/debug-tests.c') diff --git a/src/tests/debug-tests.c b/src/tests/debug-tests.c index 99f92a0ce..2708cec1d 100644 --- a/src/tests/debug-tests.c +++ b/src/tests/debug-tests.c @@ -49,11 +49,6 @@ START_TEST(test_debug_convert_old_level_old_format) SSSDBG_TRACE_ALL }; - fail_unless( - debug_convert_old_level(SSS_UNRESOLVED_DEBUG_LEVEL) == SSSDBG_UNRESOLVED, - "Invalid conversion of SSS_UNRESOLVED_DEBUG_LEVEL" - ); - for (old_level = 0; old_level <= 9; old_level++) { expected_level |= levels[old_level]; @@ -68,7 +63,7 @@ END_TEST START_TEST(test_debug_convert_old_level_new_format) { fail_unless( - debug_convert_old_level(SSSDBG_UNRESOLVED) == SSSDBG_UNRESOLVED, + debug_convert_old_level(SSSDBG_UNRESOLVED) == SSSDBG_FATAL_FAILURE, "Invalid conversion of SSSDBG_UNRESOLVED" ); fail_unless( @@ -120,7 +115,6 @@ END_TEST START_TEST(test_debug_get_level_old_format) { - fail_unless(debug_get_level(SSS_UNRESOLVED_DEBUG_LEVEL) == SSSDBG_UNRESOLVED, "Invalid conversion of -1"); fail_unless(debug_get_level(0) == SSSDBG_FATAL_FAILURE, "Invalid conversion of 0"); fail_unless(debug_get_level(1) == SSSDBG_CRIT_FAILURE, "Invalid conversion of 1"); fail_unless(debug_get_level(2) == SSSDBG_OP_FAILURE, "Invalid conversion of 2"); @@ -137,7 +131,7 @@ END_TEST START_TEST(test_debug_get_level_new_format) { fail_unless( - debug_get_level(SSSDBG_UNRESOLVED) == SSSDBG_UNRESOLVED, + debug_get_level(SSSDBG_UNRESOLVED) == SSSDBG_FATAL_FAILURE, "Invalid conversion of SSSDBG_UNRESOLVED" ); fail_unless( -- cgit