From 9cbcc60997b3d9fd6c5c17f956bc90aac1abba70 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Fri, 20 Nov 2009 12:02:33 -0500
Subject: Only display errors in unit tests

If you want to turn verbosity back on, just set the environment
variable CK_VERBOSITY=verbose
---
 server/tests/check_and_open-tests.c | 3 ++-
 server/tests/fail_over-tests.c      | 3 ++-
 server/tests/files-tests.c          | 3 ++-
 server/tests/find_uid-tests.c       | 3 ++-
 server/tests/ipa_timerules-tests.c  | 3 ++-
 server/tests/krb5_utils-tests.c     | 5 +++--
 server/tests/refcount-tests.c       | 3 ++-
 server/tests/resolv-tests.c         | 3 ++-
 server/tests/strtonum-tests.c       | 3 ++-
 server/tests/sysdb-tests.c          | 3 ++-
 10 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/server/tests/check_and_open-tests.c b/server/tests/check_and_open-tests.c
index ce5ebe19d..2e9645571 100644
--- a/server/tests/check_and_open-tests.c
+++ b/server/tests/check_and_open-tests.c
@@ -205,7 +205,8 @@ int main(void)
   int number_failed;
   Suite *s = check_and_open_suite ();
   SRunner *sr = srunner_create (s);
-  srunner_run_all (sr, CK_NORMAL);
+  /* If CK_VERBOSITY is set, use that, otherwise it defaults to CK_NORMAL */
+  srunner_run_all(sr, CK_ENV);
   number_failed = srunner_ntests_failed (sr);
   srunner_free (sr);
   return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
diff --git a/server/tests/fail_over-tests.c b/server/tests/fail_over-tests.c
index 49375a005..16cc60e3e 100644
--- a/server/tests/fail_over-tests.c
+++ b/server/tests/fail_over-tests.c
@@ -296,7 +296,8 @@ main(int argc, const char *argv[])
 
     suite = create_suite();
     sr = srunner_create(suite);
-    srunner_run_all(sr, CK_VERBOSE);
+    /* If CK_VERBOSITY is set, use that, otherwise it defaults to CK_NORMAL */
+    srunner_run_all(sr, CK_ENV);
     failure_count = srunner_ntests_failed(sr);
     srunner_free(sr);
     return (failure_count == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
diff --git a/server/tests/files-tests.c b/server/tests/files-tests.c
index bc346ba51..90b971779 100644
--- a/server/tests/files-tests.c
+++ b/server/tests/files-tests.c
@@ -314,7 +314,8 @@ int main(int argc, char *argv[])
 
     Suite *s = files_suite();
     SRunner *sr = srunner_create(s);
-    srunner_run_all(sr, CK_NORMAL);
+    /* If CK_VERBOSITY is set, use that, otherwise it defaults to CK_NORMAL */
+    srunner_run_all(sr, CK_ENV);
     number_failed = srunner_ntests_failed(sr);
     srunner_free(sr);
     return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
diff --git a/server/tests/find_uid-tests.c b/server/tests/find_uid-tests.c
index bd213cd5a..9eafadd45 100644
--- a/server/tests/find_uid-tests.c
+++ b/server/tests/find_uid-tests.c
@@ -117,7 +117,8 @@ int main(void)
     int number_failed;
     Suite *s = find_uid_suite ();
     SRunner *sr = srunner_create (s);
-    srunner_run_all (sr, CK_NORMAL);
+    /* If CK_VERBOSITY is set, use that, otherwise it defaults to CK_NORMAL */
+    srunner_run_all(sr, CK_ENV);
     number_failed = srunner_ntests_failed (sr);
     srunner_free (sr);
     return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
diff --git a/server/tests/ipa_timerules-tests.c b/server/tests/ipa_timerules-tests.c
index 12ce66509..0a7be90be 100644
--- a/server/tests/ipa_timerules-tests.c
+++ b/server/tests/ipa_timerules-tests.c
@@ -571,7 +571,8 @@ int main(int argc, const char *argv[])
 
     timelib_suite = create_timelib_suite();
     sr = srunner_create(timelib_suite);
-    srunner_run_all(sr, CK_VERBOSE);
+    /* If CK_VERBOSITY is set, use that, otherwise it defaults to CK_NORMAL */
+    srunner_run_all(sr, CK_ENV);
     failure_count = srunner_ntests_failed(sr);
     srunner_free(sr);
     return (failure_count==0 ? EXIT_SUCCESS : EXIT_FAILURE);
diff --git a/server/tests/krb5_utils-tests.c b/server/tests/krb5_utils-tests.c
index b0f6a1ddc..c3d9f4cf1 100644
--- a/server/tests/krb5_utils-tests.c
+++ b/server/tests/krb5_utils-tests.c
@@ -1,7 +1,7 @@
 /*
     SSSD
 
-    Kerberos 5 Backend Module -- Utilities tests 
+    Kerberos 5 Backend Module -- Utilities tests
 
     Authors:
         Sumit Bose <sbose@redhat.com>
@@ -297,7 +297,8 @@ int main(void)
   int number_failed;
   Suite *s = krb5_utils_suite ();
   SRunner *sr = srunner_create (s);
-  srunner_run_all (sr, CK_NORMAL);
+  /* If CK_VERBOSITY is set, use that, otherwise it defaults to CK_NORMAL */
+  srunner_run_all(sr, CK_ENV);
   number_failed = srunner_ntests_failed (sr);
   srunner_free (sr);
   return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
diff --git a/server/tests/refcount-tests.c b/server/tests/refcount-tests.c
index ff82b4ca8..db2a256ee 100644
--- a/server/tests/refcount-tests.c
+++ b/server/tests/refcount-tests.c
@@ -223,7 +223,8 @@ int main(int argc, const char *argv[])
     suite = create_suite();
     sr = srunner_create(suite);
     srunner_set_fork_status(sr, CK_FORK);
-    srunner_run_all(sr, CK_VERBOSE);
+    /* If CK_VERBOSITY is set, use that, otherwise it defaults to CK_NORMAL */
+    srunner_run_all(sr, CK_ENV);
     failure_count = srunner_ntests_failed(sr);
     srunner_free(sr);
     return (failure_count == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
diff --git a/server/tests/resolv-tests.c b/server/tests/resolv-tests.c
index ea1ac9fbb..bf76849a0 100644
--- a/server/tests/resolv-tests.c
+++ b/server/tests/resolv-tests.c
@@ -591,7 +591,8 @@ int main(int argc, const char *argv[])
 
     resolv_suite = create_resolv_suite();
     sr = srunner_create(resolv_suite);
-    srunner_run_all(sr, CK_VERBOSE);
+    /* If CK_VERBOSITY is set, use that, otherwise it defaults to CK_NORMAL */
+    srunner_run_all(sr, CK_ENV);
     failure_count = srunner_ntests_failed(sr);
     srunner_free(sr);
     return (failure_count==0 ? EXIT_SUCCESS : EXIT_FAILURE);
diff --git a/server/tests/strtonum-tests.c b/server/tests/strtonum-tests.c
index 9aa82a022..7b9cf522c 100644
--- a/server/tests/strtonum-tests.c
+++ b/server/tests/strtonum-tests.c
@@ -447,7 +447,8 @@ int main(int argc, const char *argv[]) {
 
     strtonum_suite = create_strtonum_suite();
     sr = srunner_create(strtonum_suite);
-    srunner_run_all(sr, CK_VERBOSE);
+    /* If CK_VERBOSITY is set, use that, otherwise it defaults to CK_NORMAL */
+    srunner_run_all(sr, CK_ENV);
     failure_count = srunner_ntests_failed(sr);
     srunner_free(sr);
     return (failure_count==0 ? EXIT_SUCCESS : EXIT_FAILURE);
diff --git a/server/tests/sysdb-tests.c b/server/tests/sysdb-tests.c
index f1d3ae49d..d4f0e2fdb 100644
--- a/server/tests/sysdb-tests.c
+++ b/server/tests/sysdb-tests.c
@@ -2532,7 +2532,8 @@ int main(int argc, const char *argv[]) {
 
     sysdb_suite = create_sysdb_suite();
     sr = srunner_create(sysdb_suite);
-    srunner_run_all(sr, CK_VERBOSE);
+    /* If CK_VERBOSITY is set, use that, otherwise it defaults to CK_NORMAL */
+    srunner_run_all(sr, CK_ENV);
     failure_count = srunner_ntests_failed(sr);
     srunner_free(sr);
     return (failure_count==0 ? EXIT_SUCCESS : EXIT_FAILURE);
-- 
cgit