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

Only declare variables at the beginning of a code block. Bug #511654.

Browse Source 
2008-01-23  Jens Granseuer  <jensgr@gmx.net>

	* glib/gtestutils.c: (g_test_trap_fork):
	* glib/tests/testing.c: (test_assertions): Only declare variables at
	the beginning of a code block. Bug #511654.

svn path=/trunk/; revision=6361
This commit is contained in:
Jens Granseuer 2008-01-23 22:22:27 +00:00 committed by Jens Granseuer
parent 62d9a57c97
commit afc9506e9e
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-01-23 Jens Granseuer <jensgr@gmx.net>
* glib/gtestutils.c: (g_test_trap_fork):
* glib/tests/testing.c: (test_assertions): Only declare variables at
the beginning of a code block. Bug #511654.
2008-01-21 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version

3
glib/gtestutils.c
View File

@ -1457,6 +1457,7 @@ g_test_trap_fork (guint64 usec_timeout,
{
fd_set fds;
struct timeval tv;
int ret;
FD_ZERO (&fds);
if (stdout_pipe[0] >= 0)
FD_SET (stdout_pipe[0], &fds);
@ -1466,7 +1467,7 @@ g_test_trap_fork (guint64 usec_timeout,
FD_SET (stdtst_pipe[0], &fds);
tv.tv_sec = 0;
tv.tv_usec = MIN (usec_timeout ? usec_timeout : 1000000, 100 * 1000); /* sleep at most 0.5 seconds to catch clock skews, etc. */
int ret = select (MAX (MAX (stdout_pipe[0], stderr_pipe[0]), stdtst_pipe[0]) + 1, &fds, NULL, NULL, &tv);
ret = select (MAX (MAX (stdout_pipe[0], stderr_pipe[0]), stdtst_pipe[0]) + 1, &fds, NULL, NULL, &tv);
if (ret < 0 && errno != EINTR)
{
g_warning ("Unexpected error in select() while reading from child process (%d): %s", test_trap_last_pid, g_strerror (errno));

3
glib/tests/testing.c
View File

@ -26,13 +26,14 @@
static void
test_assertions (void)
{
gchar *fuu;
g_assert_cmpint (1, >, 0);
g_assert_cmphex (2, ==, 2);
g_assert_cmpfloat (3.3, !=, 7);
g_assert_cmpfloat (7, <=, 3 + 4);
g_assert (TRUE);
g_assert_cmpstr ("foo", !=, "faa");
gchar *fuu = g_strdup_printf ("f%s", "uu");
fuu = g_strdup_printf ("f%s", "uu");
g_test_queue_free (fuu);
g_assert_cmpstr ("foo", !=, fuu);
g_assert_cmpstr ("fuu", ==, fuu);