r21726 - gnucash/trunk/src - [Testing] Suppress expected messages from guile tests
John Ralls
jralls at code.gnucash.org
Mon Dec 12 17:42:02 EST 2011
Author: jralls
Date: 2011-12-12 17:42:02 -0500 (Mon, 12 Dec 2011)
New Revision: 21726
Trac: http://svn.gnucash.org/trac/changeset/21726
Modified:
gnucash/trunk/src/gnc-module/test/Makefile.am
gnucash/trunk/src/gnc-module/test/test-gwrapped-c
gnucash/trunk/src/gnc-module/test/test-load-deps
gnucash/trunk/src/gnc-module/test/test-load-scm
gnucash/trunk/src/gnc-module/test/test-scm-init
gnucash/trunk/src/gnc-module/test/test-scm-module
gnucash/trunk/src/gnc-module/test/test-scm-multi
gnucash/trunk/src/report/stylesheets/test/Makefile.am
gnucash/trunk/src/report/stylesheets/test/test-load-module
Log:
[Testing] Suppress expected messages from guile tests
Modified: gnucash/trunk/src/gnc-module/test/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/Makefile.am 2011-12-12 22:41:51 UTC (rev 21725)
+++ gnucash/trunk/src/gnc-module/test/Makefile.am 2011-12-12 22:42:02 UTC (rev 21726)
@@ -33,12 +33,14 @@
--gnc-module-dir ${top_builddir}/src/gnc-module/test/mod-bar \
--gnc-module-dir ${top_builddir}/src/gnc-module/test/mod-baz \
--gnc-module-dir ${top_builddir}/src/gnc-module/test/misc-mods \
+ --guile-load-dir ${top_builddir}/src/test-core \
--guile-load-dir ${top_builddir}/src/gnc-module \
--guile-load-dir ${top_srcdir}/src/gnc-module/test/mod-foo \
--guile-load-dir ${top_srcdir}/src/gnc-module/test/mod-baz \
--guile-load-dir ${top_srcdir}/src/gnc-module/test/mod-bar \
--library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/src/core-utils \
+ --library-dir ${top_builddir}/src/test-core \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/gnc-module/test/mod-foo \
--library-dir ${top_builddir}/src/gnc-module/test/mod-bar \
Modified: gnucash/trunk/src/gnc-module/test/test-gwrapped-c
===================================================================
--- gnucash/trunk/src/gnc-module/test/test-gwrapped-c 2011-12-12 22:41:51 UTC (rev 21725)
+++ gnucash/trunk/src/gnc-module/test/test-gwrapped-c 2011-12-12 22:42:02 UTC (rev 21726)
@@ -1,5 +1,15 @@
#! /bin/sh
-guile -c "(use-modules (gnucash gnc-module))
+guile -c "(use-modules (gnucash test-stuff))
+ (define log-domain \"gnc.module\")
+ (define check (new-TestErrorStruct))
+ (define log-level (G-LOG-LEVEL-WARNING))
+ (define msg \"Module '../../../src/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n\")
+ (TestErrorStruct-log-domain-set check log-domain)
+ (TestErrorStruct-log-level-set check log-level)
+ (TestErrorStruct-msg-set check msg)
+ (define handler (test-set-checked-handler log-domain log-level check))
+ (use-modules (gnucash gnc-module))
(gnc:module-system-init)
(gnc:module-load \"gnucash/foo\" 0)
- (exit (eq? 10 (foo-hello)))"
+ (exit (eq? 10 (foo-hello)))
+ (g-log-remove-handler log-domain handler)"
Modified: gnucash/trunk/src/gnc-module/test/test-load-deps
===================================================================
--- gnucash/trunk/src/gnc-module/test/test-load-deps 2011-12-12 22:41:51 UTC (rev 21725)
+++ gnucash/trunk/src/gnc-module/test/test-load-deps 2011-12-12 22:42:02 UTC (rev 21726)
@@ -3,6 +3,15 @@
!#
;; test-load-deps.scm : load gnc-mod-baz, which depends on gnc-mod-foo
+(use-modules (gnucash test-stuff))
+(define log-domain "gnc.module")
+(define check (new-TestErrorStruct))
+(define log-level (G-LOG-LEVEL-WARNING))
+(define msg "Module '../../../src/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n")
+(TestErrorStruct-log-domain-set check log-domain)
+(TestErrorStruct-log-level-set check log-level)
+(TestErrorStruct-msg-set check msg)
+(define handler (test-set-checked-handler log-domain log-level check))
(use-modules (gnucash gnc-module))
(gnc:module-system-init)
@@ -13,6 +22,8 @@
(baz:scheme-hello)
(foo:scheme-hello)
+(g-log-remove-handler log-domain handler)
+
(exit 0)
;; Local Variables:
Modified: gnucash/trunk/src/gnc-module/test/test-load-scm
===================================================================
--- gnucash/trunk/src/gnc-module/test/test-load-scm 2011-12-12 22:41:51 UTC (rev 21725)
+++ gnucash/trunk/src/gnc-module/test/test-load-scm 2011-12-12 22:42:02 UTC (rev 21726)
@@ -2,10 +2,19 @@
exec guile -s $0 "$@"
!#
+(use-modules (gnucash test-stuff))
+(define log-domain "gnc.module")
+(define check (new-TestErrorStruct))
+(define log-level (G-LOG-LEVEL-WARNING))
+(define msg "Module '../../../src/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n")
+(TestErrorStruct-log-domain-set check log-domain)
+(TestErrorStruct-log-level-set check log-level)
+(TestErrorStruct-msg-set check msg)
+(define handler (test-set-checked-handler log-domain log-level check))
(use-modules (gnucash gnc-module))
(gnc:module-system-init)
(gnc:module-load "gnucash/foo" 0)
-
+(g-log-remove-handler log-domain handler)
;; Local Variables:
;; mode: scheme
;; End:
Modified: gnucash/trunk/src/gnc-module/test/test-scm-init
===================================================================
--- gnucash/trunk/src/gnc-module/test/test-scm-init 2011-12-12 22:41:51 UTC (rev 21725)
+++ gnucash/trunk/src/gnc-module/test/test-scm-init 2011-12-12 22:42:02 UTC (rev 21726)
@@ -3,9 +3,21 @@
exec guile -s $0 "$@"
!#
+(use-modules (gnucash test-stuff))
+(define log-domain "gnc.module")
+(define check (new-TestErrorStruct))
+(define log-level (G-LOG-LEVEL-WARNING))
+(define msg "Module '../../../src/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n")
+(TestErrorStruct-log-domain-set check log-domain)
+(TestErrorStruct-log-level-set check log-level)
+(TestErrorStruct-msg-set check msg)
+(define handler (test-set-checked-handler log-domain log-level check))
+
(use-modules (gnucash gnc-module))
(gnc:module-system-init)
+(g-log-remove-handler log-domain handler)
+
;; LocalVariables:
;; mode: scheme
;; End:
Modified: gnucash/trunk/src/gnc-module/test/test-scm-module
===================================================================
--- gnucash/trunk/src/gnc-module/test/test-scm-module 2011-12-12 22:41:51 UTC (rev 21725)
+++ gnucash/trunk/src/gnc-module/test/test-scm-module 2011-12-12 22:42:02 UTC (rev 21726)
@@ -1,5 +1,15 @@
#! /bin/sh
-guile -c "(use-modules (gnucash gnc-module))
+guile -c "(use-modules (gnucash test-stuff))
+ (define log-domain \"gnc.module\")
+ (define check (new-TestErrorStruct))
+ (define log-level (G-LOG-LEVEL-WARNING))
+ (define msg \"Module '../../../src/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n\")
+ (TestErrorStruct-log-domain-set check log-domain)
+ (TestErrorStruct-log-level-set check log-level)
+ (TestErrorStruct-msg-set check msg)
+ (define handler (test-set-checked-handler log-domain log-level check))
+ (use-modules (gnucash gnc-module))
(gnc:module-system-init)
(if (not (gnc:module-load \"gnucash/foo\" 0)) (exit -1))
- (exit (foo:scheme-hello))"
+ (exit (foo:scheme-hello))
+ (g-log-remove-handler log-domain handler)"
Modified: gnucash/trunk/src/gnc-module/test/test-scm-multi
===================================================================
--- gnucash/trunk/src/gnc-module/test/test-scm-multi 2011-12-12 22:41:51 UTC (rev 21725)
+++ gnucash/trunk/src/gnc-module/test/test-scm-multi 2011-12-12 22:42:02 UTC (rev 21726)
@@ -1,6 +1,15 @@
#! /bin/sh
exec guile -s $0 "$@"
!#
+(use-modules (gnucash test-stuff))
+(define log-domain "gnc.module")
+(define check (new-TestErrorStruct))
+(define log-level (G-LOG-LEVEL-WARNING))
+(define msg "Module '../../../src/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n")
+(TestErrorStruct-log-domain-set check log-domain)
+(TestErrorStruct-log-level-set check log-level)
+(TestErrorStruct-msg-set check msg)
+(define handler (test-set-checked-handler log-domain log-level check))
(use-modules (gnucash gnc-module))
(gnc:module-system-init)
@@ -13,6 +22,8 @@
(bar-hello)
(bar:scheme-hello)
+(g-log-remove-handler log-domain handler)
+
;; Local Variables:
;; mode: scheme
;; End:
Modified: gnucash/trunk/src/report/stylesheets/test/Makefile.am
===================================================================
--- gnucash/trunk/src/report/stylesheets/test/Makefile.am 2011-12-12 22:41:51 UTC (rev 21725)
+++ gnucash/trunk/src/report/stylesheets/test/Makefile.am 2011-12-12 22:42:02 UTC (rev 21726)
@@ -8,6 +8,7 @@
--gnc-module-dir ${top_builddir}/src/report/stylesheets \
--gnc-module-dir ${top_builddir}/src/calculation \
\
+ --guile-load-dir ${top_builddir}/src/test-core \
--guile-load-dir ${top_builddir}/src/gnc-module \
--guile-load-dir ${top_builddir}/src/engine \
--guile-load-dir ${top_builddir}/src/scm \
@@ -18,6 +19,7 @@
--guile-load-dir ${top_builddir}/src/report/stylesheets \
\
--library-dir ${top_builddir}/src/libqof/qof \
+ --library-dir ${top_builddir}/src/test-core \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/engine \
Modified: gnucash/trunk/src/report/stylesheets/test/test-load-module
===================================================================
--- gnucash/trunk/src/report/stylesheets/test/test-load-module 2011-12-12 22:41:51 UTC (rev 21725)
+++ gnucash/trunk/src/report/stylesheets/test/test-load-module 2011-12-12 22:42:02 UTC (rev 21726)
@@ -4,14 +4,25 @@
(setenv "GNC_UNINSTALLED" "1")
(display " testing stylesheet module load ... ")
+(use-modules (gnucash test-stuff))
+(define log-domain "gnc.report.core")
+(define check (new-TestErrorStruct))
+(define log-level (G-LOG-LEVEL-CRITICAL))
+(define msg "gnc_get_default_report_font_family: assertion `top_list != NULL' failed")
+(TestErrorStruct-log-domain-set check log-domain)
+(TestErrorStruct-log-level-set check log-level)
+(TestErrorStruct-msg-set check msg)
+(define handler (test-set-checked-handler log-domain log-level check))
(use-modules (gnucash gnc-module))
(gnc:module-system-init)
(if (gnc:module-load "gnucash/report/stylesheets" 0)
(begin
+ (g-log-remove-handler log-domain handler)
(display "ok\n")
(exit 0))
(begin
+ (g-log-remove-handler log-domain handler)
(display "failed\n")
(exit -1)))
More information about the gnucash-changes
mailing list