summaryrefslogtreecommitdiff
path: root/glib/gtestutils.h
diff options
context:
space:
mode:
author21:06:47 Tim Janik <timj@imendio.com>2007-11-21 20:09:46 +0000
committerTim Janik <timj@src.gnome.org>2007-11-21 20:09:46 +0000
commit1e55738f31385ddb3bf172ba3590a79cf42782f4 (patch)
tree7fe6d77dc08924cce36731cfc2ed42295cf35df0 /glib/gtestutils.h
parent49568d5f163a661f1d52a25bd450a4c6ca5b3e18 (diff)
downloadglib-1e55738f31385ddb3bf172ba3590a79cf42782f4.tar.gz
initialize automake variables EXTRA_DIST and TEST_PROGS for unconditional
2007-11-21 21:06:47 Tim Janik <timj@imendio.com> * Makefile.decl: initialize automake variables EXTRA_DIST and TEST_PROGS for unconditional appending via += in other makefiles. define recursive test targets: test, test-report, perf-report, full-report, as described here: http://mail.gnome.org/archives/gtk-devel-list/2007-November/msg00000.html * Makefile.am: * build/win32/vs8/Makefile.am, build/win32/dirent/Makefile.am: * build/win32/Makefile.am, build/Makefile.am: * docs/Makefile.am, docs/reference/Makefile.am: * docs/reference/glib/Makefile.am, docs/reference/gobject/Makefile.am: * gmodule/Makefile.am, tests/Makefile.am: * tests/refcount/Makefile.am, tests/gobject/Makefile.am: * glib/update-pcre/Makefile.am, glib/libcharset/Makefile.am: * glib/tests/Makefile.am, glib/pcre/Makefile.am: * glib/gnulib/Makefile.am, gobject/Makefile.am, m4macros/Makefile.am: * gthread/Makefile.am, glib/Makefile.am: include $(top_srcdir)/Makefile.decl, adapted EXTRA_DIST assignments. * glib/tests/Makefile.am: removed example testing rules. * glib/tests/testing.c: conditionalized performance and slow tests. * glib/gtestutils.h: * glib/gtestutils.c: work around g_test_config_vars not changing its exported value after value assignments, aparently due to symbol aliases. * glib/gtester.c: fixed off-by-one error which produced junk in logs. * configure.in: check for python >= 2.4 and provide $PYTHON for scripts. svn path=/trunk/; revision=5914
Diffstat (limited to 'glib/gtestutils.h')
-rw-r--r--glib/gtestutils.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/glib/gtestutils.h b/glib/gtestutils.h
index 2b60b72a5..d2c969013 100644
--- a/glib/gtestutils.h
+++ b/glib/gtestutils.h
@@ -67,6 +67,7 @@ void g_test_init (int *argc,
...);
/* query testing framework config */
#define g_test_quick() (g_test_config_vars->test_quick)
+#define g_test_slow() (!g_test_config_vars->test_quick)
#define g_test_perf() (g_test_config_vars->test_perf)
#define g_test_verbose() (g_test_config_vars->test_verbose)
#define g_test_quiet() (g_test_config_vars->test_quiet)
@@ -180,12 +181,13 @@ void g_test_add_vtable (const char *testpath,
void (*data_test) (void),
void (*data_teardown) (void));
typedef struct {
+ gboolean test_initialized;
gboolean test_quick; /* disable thorough tests */
gboolean test_perf; /* run performance tests */
gboolean test_verbose; /* extra info */
gboolean test_quiet; /* reduce output */
} GTestConfig;
-GLIB_VAR const GTestConfig *g_test_config_vars;
+GLIB_VAR const GTestConfig * const g_test_config_vars;
/* internal logging API */
typedef enum {