From 99dd40a885ed3d42af4bbbde7ee2fc98830544d0 Mon Sep 17 00:00:00 2001
From: Pavel Březina <pbrezina@redhat.com>
Date: Tue, 9 Aug 2011 13:01:05 +0200
Subject: New DEBUG facility - conversion

https://fedorahosted.org/sssd/ticket/925

Conversion of the old debug_level format to the new one.
(only where it was necessary)

Removed:
  SSS_DEFAULT_DEBUG_LEVEL (completely replaced with SSSDBG_DEFAULT)
---
 src/tests/auth-tests.c          | 2 ++
 src/tests/crypto-tests.c        | 2 +-
 src/tests/fail_over-tests.c     | 2 +-
 src/tests/files-tests.c         | 2 +-
 src/tests/find_uid-tests.c      | 2 +-
 src/tests/krb5_utils-tests.c    | 1 +
 src/tests/refcount-tests.c      | 2 +-
 src/tests/resolv-tests.c        | 2 +-
 src/tests/simple_access-tests.c | 1 +
 src/tests/strtonum-tests.c      | 2 ++
 src/tests/sysdb-tests.c         | 2 ++
 src/tests/util-tests.c          | 2 ++
 12 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'src/tests')

diff --git a/src/tests/auth-tests.c b/src/tests/auth-tests.c
index 02646627..aae2d008 100644
--- a/src/tests/auth-tests.c
+++ b/src/tests/auth-tests.c
@@ -320,6 +320,8 @@ int main(int argc, const char *argv[])
     }
     poptFreeContext(pc);
 
+    debug_level = debug_convert_old_level(debug_level);
+
     tests_set_cwd();
 
     ret = clean_db_dir();
diff --git a/src/tests/crypto-tests.c b/src/tests/crypto-tests.c
index 286bc235..0f6f2fe0 100644
--- a/src/tests/crypto-tests.c
+++ b/src/tests/crypto-tests.c
@@ -135,7 +135,7 @@ int main(int argc, const char *argv[])
     }
     poptFreeContext(pc);
 
-    debug_level = debug;
+    debug_level = debug_convert_old_level(debug);
     tests_set_cwd();
 
     Suite *s = crypto_suite();
diff --git a/src/tests/fail_over-tests.c b/src/tests/fail_over-tests.c
index 8beaa8a2..439e5cf2 100644
--- a/src/tests/fail_over-tests.c
+++ b/src/tests/fail_over-tests.c
@@ -307,7 +307,7 @@ main(int argc, const char *argv[])
         }
     }
     poptFreeContext(pc);
-    debug_level = debug;
+    debug_level = debug_convert_old_level(debug);
 
     tests_set_cwd();
 
diff --git a/src/tests/files-tests.c b/src/tests/files-tests.c
index 7f6b41ed..15d34c8e 100644
--- a/src/tests/files-tests.c
+++ b/src/tests/files-tests.c
@@ -318,7 +318,7 @@ int main(int argc, const char *argv[])
         return 1;
     }
     poptFreeContext(pc);
-    debug_level = debug;
+    debug_level = debug_convert_old_level(debug);
 
     tests_set_cwd();
 
diff --git a/src/tests/find_uid-tests.c b/src/tests/find_uid-tests.c
index 8d1362f7..a8f74056 100644
--- a/src/tests/find_uid-tests.c
+++ b/src/tests/find_uid-tests.c
@@ -114,7 +114,7 @@ Suite *find_uid_suite (void)
 
 int main(void)
 {
-    debug_level = 255;
+    debug_level = SSSDBG_MASK_ALL;
     int number_failed;
 
     tests_set_cwd();
diff --git a/src/tests/krb5_utils-tests.c b/src/tests/krb5_utils-tests.c
index d5d1f094..65e43193 100644
--- a/src/tests/krb5_utils-tests.c
+++ b/src/tests/krb5_utils-tests.c
@@ -654,6 +654,7 @@ int main(int argc, const char *argv[])
     }
     poptFreeContext(pc);
 
+    debug_level = debug_convert_old_level(debug_level);
 
     ret = mkdir(TESTS_PATH, 0775);
     if (ret != EOK) {
diff --git a/src/tests/refcount-tests.c b/src/tests/refcount-tests.c
index 5e85b6f8..99eedd9d 100644
--- a/src/tests/refcount-tests.c
+++ b/src/tests/refcount-tests.c
@@ -218,7 +218,7 @@ int main(int argc, const char *argv[])
         }
     }
     poptFreeContext(pc);
-    debug_level = debug;
+    debug_level = debug_convert_old_level(debug);
 
     tests_set_cwd();
 
diff --git a/src/tests/resolv-tests.c b/src/tests/resolv-tests.c
index 5c1a487f..3768fc97 100644
--- a/src/tests/resolv-tests.c
+++ b/src/tests/resolv-tests.c
@@ -790,7 +790,7 @@ int main(int argc, const char *argv[])
         }
     }
     poptFreeContext(pc);
-    debug_level = debug;
+    debug_level = debug_convert_old_level(debug);
 
     if (!use_net_test) {
         printf("Network tests disabled. Rerun with the \"-n\" "
diff --git a/src/tests/simple_access-tests.c b/src/tests/simple_access-tests.c
index fbbc8361..6ae2356b 100644
--- a/src/tests/simple_access-tests.c
+++ b/src/tests/simple_access-tests.c
@@ -162,6 +162,7 @@ int main(int argc, const char *argv[])
     }
     poptFreeContext(pc);
 
+    debug_level = debug_convert_old_level(debug_level);
 
     Suite *s = access_simple_suite();
     SRunner *sr = srunner_create(s);
diff --git a/src/tests/strtonum-tests.c b/src/tests/strtonum-tests.c
index 2b91d482..8e86c11f 100644
--- a/src/tests/strtonum-tests.c
+++ b/src/tests/strtonum-tests.c
@@ -446,6 +446,8 @@ int main(int argc, const char *argv[]) {
     }
     poptFreeContext(pc);
 
+    debug_level = debug_convert_old_level(debug_level);
+
     tests_set_cwd();
 
     strtonum_suite = create_strtonum_suite();
diff --git a/src/tests/sysdb-tests.c b/src/tests/sysdb-tests.c
index 4c2021cf..87b06ee4 100644
--- a/src/tests/sysdb-tests.c
+++ b/src/tests/sysdb-tests.c
@@ -3120,6 +3120,8 @@ int main(int argc, const char *argv[]) {
     }
     poptFreeContext(pc);
 
+    debug_level = debug_convert_old_level(debug_level);
+
     tests_set_cwd();
 
     ret = unlink(TESTS_PATH"/"LOCAL_SYSDB_FILE);
diff --git a/src/tests/util-tests.c b/src/tests/util-tests.c
index e6d099b6..b347aa7e 100644
--- a/src/tests/util-tests.c
+++ b/src/tests/util-tests.c
@@ -355,6 +355,8 @@ int main(int argc, const char *argv[])
     }
     poptFreeContext(pc);
 
+    debug_level = debug_convert_old_level(debug_level);
+
     tests_set_cwd();
 
     srunner_run_all(sr, CK_ENV);
-- 
cgit