Hi,

My first attempt at a merge request :-)

I find that the output of make check is a bit noisy - all the passing tests 
obscure which one or two have failed.

The attached patch changes from CK_VERBOSE to CK_ENV, which allows use of an 
environment variable (CK_VERBOSITY) to set the output "noise" level. By 
default it just gives the test suite names (as they are run), the summary 
line, and the failing tests.

Brad
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [email protected]\
#   5t82q3rjmahrne3j
# target_branch: http://bzr.savannah.gnu.org/r/pdf/libgnupdf/branches\
#   /trunk/
# testament_sha1: 786c8d2945dadd947492eb8467396a3c266559f6
# timestamp: 2009-06-17 10:07:18 +1000
# base_revision_id: [email protected]
# 
# Begin patch
=== modified file 'AUTHORS'
--- AUTHORS	2009-06-16 20:19:33 +0000
+++ AUTHORS	2009-06-17 00:04:53 +0000
@@ -71,15 +71,19 @@
   torture/unit/base/stm/pdf-stm-write.c
   torture/unit/base/stm/pdf-stm-read.c
 
-Brad Hards: changed torture/unit/base/time/pdf-time-from-string.c
-  torture/unit/base/time/pdf-time-copy.c doc/gnupdf.texi
+Brad Hards: changed doc/gnupdf-hg.texi
+  doc/gnupdf.texi
+  torture/unit/base/time/pdf-time-from-string.c
+  torture/unit/base/time/pdf-time-copy.c 
   torture/unit/base/crypt/pdf-crypt-md-new.c
   torture/unit/base/crypt/pdf-crypt-md-read.c
   torture/unit/base/text/pdf-text-dup.c
-  torture/unit/base/text/pdf-text-new-destroy. torture/unit/base/text/pdf-text-new-from-host.c
+  torture/unit/base/text/pdf-text-new-destroy
+  torture/unit/base/text/pdf-text-new-from-host.c
   torture/unit/base/types/pdf-i64-abs.c
   torture/unit/base/types/pdf-i64-mod.c
   torture/unit/base/types/pdf-i64-neg.c
+  torture/unit/runtests.c
 
 Daniel Vidal: wrote /torture/unit/base/types/pdf-i64-add.c
   /torture/unit/base/types/pdf-i64-assign.c

=== modified file 'ChangeLog'
--- ChangeLog	2009-06-16 20:22:17 +0000
+++ ChangeLog	2009-06-17 00:04:53 +0000
@@ -1,3 +1,11 @@
+2009-06-17  Brad Hards  <[email protected]>
+
+	* doc/gnupdf-hg.texi (Running the unit tests): document use of
+	the CK_VERBOSITY environment variable.
+	Minor other doco fixes.
+
+	* torture/unit/runtests.c (main): use CK_ENV instead of CK_VERBOSE.
+
 2009-06-16  Jose E. Marchesi  <[email protected]>
 
 	* src/base/pdf-stm.c (pdf_stm_init): Initialize seq_counter to 0.

=== modified file 'doc/gnupdf-hg.texi'
--- doc/gnupdf-hg.texi	2009-05-15 13:31:34 +0000
+++ doc/gnupdf-hg.texi	2009-06-17 00:04:53 +0000
@@ -1049,20 +1049,34 @@
 also dump a logfile named @file{ut.log} with details about the test
 execution.
 
+The runtests program will (by default) output a list of which test
+suites were run, then a summary line followed by a list of failing
+lists. You can get a full list of tests (passing and failing) by 
+setting the @code{CK_VERBOSITY} environment variable to 'verbose'.
+You can get just the summary line and failing lists by setting the
+...@code{ck_verbosity} environment variable to 'minimal', and you can
+produce no output by setting it to 'silent'. Note that tests (in
+particular, the error reporting tests) may output additional 
+information as part of their normal operation - that isn't really
+part of the check testing framework, and won't be affected by the
+...@code{ck_verbosity} environment variable.
+
+
 @node Using gdb to debug check tests
 @subsection Using gdb to debug check tests
 
 The check testing framework uses fork calls in order to create the
-processes used to run the single tests. This makes possible to caught
+processes used to run the single tests. This makes possible to catch
 unexpected process terminations such as a segmentation fault or a
 division by zero.
 
 Sometimes we want to debug those failure conditions using
-gdb. Unfortunately the GNU debugger cannot caught the unexpected
+gdb. Unfortunately the GNU debugger cannot catch the unexpected
 termination of the child processess.
 
-The check implementor foreseen this and provides a workaround: to
-define the @code{CK_FORK} variable to "no" and launch the debugger.
+The check implementor foresaw this and provides a workaround: to
+define the @code{CK_FORK} environment variable to "no" and launch
+the debugger.
 
 @node Test Data Files
 @section Test Data Files

=== modified file 'torture/unit/runtests.c'
--- torture/unit/runtests.c	2009-05-20 04:01:14 +0000
+++ torture/unit/runtests.c	2009-06-17 00:04:53 +0000
@@ -46,7 +46,7 @@
   srunner_set_log (sr, "ut.log");
 
   /* Run all test suites */
-  srunner_run_all (sr, CK_VERBOSE);
+  srunner_run_all (sr, CK_ENV);
   failures = srunner_ntests_failed (sr);
   srunner_free (sr);
   

# Begin bundle
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

Reply via email to