luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-23 20:46:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bring up to GLib coding standards: remove C99 comments, trailing commas in

Browse Source 
2007-12-21  Matthias Clasen  <mclasne@redhat.com>

        * glib/gtestutils.h: Bring up to GLib coding standards: remove
        C99 comments, trailing commas in enumerations and extra ; after
        G_BEGIN/END_DECLS. Among other things, this makes xulrunner build
        against GLib 2.15.

        * glib/gtester.c: More of the same


svn path=/trunk/; revision=6185
This commit is contained in:
Matthias Clasen 2007-12-21 13:58:42 +00:00 committed by Matthias Clasen
parent 1cda3c9e01
commit c53134b57c
3 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2007-12-21 Matthias Clasen <mclasne@redhat.com>
* glib/gtestutils.h: Bring up to GLib coding standards: remove
C99 comments, trailing commas in enumerations and extra ; after
G_BEGIN/END_DECLS. Among other things, this makes xulrunner build
against GLib 2.15.
* glib/gtester.c: More of the same
2007-12-09 Hans Breuer <hans@breuer.org> 2007-12-09 Hans Breuer <hans@breuer.org>
* tests/gio-ls.c : adapt to recent api changes * tests/gio-ls.c : adapt to recent api changes

8
glib/gtester.c
View File

@ -156,7 +156,7 @@ test_log_msg (GTestLogMsg *msg)
log_indent += 2; log_indent += 2;
break; break;
case G_TEST_LOG_SKIP_CASE: case G_TEST_LOG_SKIP_CASE:
if (FALSE && gtester_verbose) // enable to debug test case skipping logic if (FALSE && gtester_verbose) /* enable to debug test case skipping logic */
{ {
gchar *sc = g_strconcat (msg->strings[0], ":", NULL); gchar *sc = g_strconcat (msg->strings[0], ":", NULL);
gchar *sleft = g_strdup_printf ("%-68s", sc); gchar *sleft = g_strdup_printf ("%-68s", sc);
@ -224,7 +224,7 @@ child_report_cb (GIOChannel *source,
(void) status; (void) status;
} }
while (length > 0); while (length > 0);
// g_print ("LASTIOSTATE: first_read_eof=%d condition=%d\n", first_read_eof, condition); /* g_print ("LASTIOSTATE: first_read_eof=%d condition=%d\n", first_read_eof, condition); */
if (first_read_eof || (condition & (G_IO_ERR | G_IO_HUP))) if (first_read_eof || (condition & (G_IO_ERR | G_IO_HUP)))
{ {
/* if there's no data to read and select() reports an error or hangup, /* if there's no data to read and select() reports an error or hangup,
@ -365,7 +365,7 @@ launch_test_binary (const char *binary,
subtest_io_pending || /* FALSE once ioc_report closes */ subtest_io_pending || /* FALSE once ioc_report closes */
loop_pending) /* TRUE while idler, etc are running */ loop_pending) /* TRUE while idler, etc are running */
{ {
// g_print ("LOOPSTATE: subtest_running=%d subtest_io_pending=%d\n", subtest_running, subtest_io_pending); /* g_print ("LOOPSTATE: subtest_running=%d subtest_io_pending=%d\n", subtest_running, subtest_io_pending); */
/* check for unexpected hangs that are not signalled on report_pipe */ /* check for unexpected hangs that are not signalled on report_pipe */
if (!subtest_running && /* child exited */ if (!subtest_running && /* child exited */
subtest_io_pending && /* no EOF detected on report_pipe */ subtest_io_pending && /* no EOF detected on report_pipe */
@ -468,7 +468,7 @@ parse_args (gint *argc_p,
{ {
gtester_selftest = TRUE; gtester_selftest = TRUE;
argv[i] = NULL; argv[i] = NULL;
break; // stop parsing regular gtester arguments break; /* stop parsing regular gtester arguments */
} }
else if (strcmp (argv[i], "-h") == 0 || strcmp (argv[i], "--help") == 0) else if (strcmp (argv[i], "-h") == 0 || strcmp (argv[i], "--help") == 0)
{ {

30
glib/gtestutils.h
View File

@ -22,7 +22,7 @@
#include <glib.h> #include <glib.h>
G_BEGIN_DECLS; G_BEGIN_DECLS
typedef struct GTestCase GTestCase; typedef struct GTestCase GTestCase;
typedef struct GTestSuite GTestSuite; typedef struct GTestSuite GTestSuite;
@ -105,8 +105,8 @@ void g_test_bug_base (const char *uri_pattern);
void g_test_bug (const char *bug_uri_snippet); void g_test_bug (const char *bug_uri_snippet);
/* measure test timings */ /* measure test timings */
void g_test_timer_start (void); void g_test_timer_start (void);
double g_test_timer_elapsed (void); // elapsed seconds double g_test_timer_elapsed (void); /* elapsed seconds */
double g_test_timer_last (void); // repeat last elapsed() result double g_test_timer_last (void); /* repeat last elapsed() result */
/* automatically g_free or g_object_unref upon teardown */ /* automatically g_free or g_object_unref upon teardown */
void g_test_queue_free (gpointer gfree_pointer); void g_test_queue_free (gpointer gfree_pointer);
@ -118,7 +118,7 @@ void g_test_queue_destroy (GDestroyNotify destroy_func,
typedef enum { typedef enum {
G_TEST_TRAP_SILENCE_STDOUT = 1 << 7, G_TEST_TRAP_SILENCE_STDOUT = 1 << 7,
G_TEST_TRAP_SILENCE_STDERR = 1 << 8, G_TEST_TRAP_SILENCE_STDERR = 1 << 8,
G_TEST_TRAP_INHERIT_STDIN = 1 << 9, G_TEST_TRAP_INHERIT_STDIN = 1 << 9
} GTestTrapFlags; } GTestTrapFlags;
gboolean g_test_trap_fork (guint64 usec_timeout, gboolean g_test_trap_fork (guint64 usec_timeout,
GTestTrapFlags test_trap_flags); GTestTrapFlags test_trap_flags);
@ -207,21 +207,21 @@ GLIB_VAR const GTestConfig * const g_test_config_vars;
/* internal logging API */ /* internal logging API */
typedef enum { typedef enum {
G_TEST_LOG_NONE, G_TEST_LOG_NONE,
G_TEST_LOG_ERROR, // s:msg G_TEST_LOG_ERROR, /* s:msg */
G_TEST_LOG_START_BINARY, // s:binaryname s:seed G_TEST_LOG_START_BINARY, /* s:binaryname s:seed */
G_TEST_LOG_LIST_CASE, // s:testpath G_TEST_LOG_LIST_CASE, /* s:testpath */
G_TEST_LOG_SKIP_CASE, // s:testpath G_TEST_LOG_SKIP_CASE, /* s:testpath */
G_TEST_LOG_START_CASE, // s:testpath G_TEST_LOG_START_CASE, /* s:testpath */
G_TEST_LOG_STOP_CASE, // d:status d:nforks d:elapsed G_TEST_LOG_STOP_CASE, /* d:status d:nforks d:elapsed */
G_TEST_LOG_MIN_RESULT, // s:blurb d:result G_TEST_LOG_MIN_RESULT, /* s:blurb d:result */
G_TEST_LOG_MAX_RESULT, // s:blurb d:result G_TEST_LOG_MAX_RESULT, /* s:blurb d:result */
G_TEST_LOG_MESSAGE, // s:blurb G_TEST_LOG_MESSAGE /* s:blurb */
} GTestLogType; } GTestLogType;
typedef struct { typedef struct {
GTestLogType log_type; GTestLogType log_type;
guint n_strings; guint n_strings;
gchar **strings; // NULL terminated gchar **strings; /* NULL terminated */
guint n_nums; guint n_nums;
long double *nums; long double *nums;
} GTestLogMsg; } GTestLogMsg;
@ -240,6 +240,6 @@ void g_test_log_buffer_push (GTestLogBuffer *tbuffer,
GTestLogMsg* g_test_log_buffer_pop (GTestLogBuffer *tbuffer); GTestLogMsg* g_test_log_buffer_pop (GTestLogBuffer *tbuffer);
void g_test_log_msg_free (GTestLogMsg *tmsg); void g_test_log_msg_free (GTestLogMsg *tmsg);
G_END_DECLS; G_END_DECLS
#endif /* __G_TEST_UTILS_H__ */ #endif /* __G_TEST_UTILS_H__ */