diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-12 | 7 | ||||
| -rw-r--r-- | tests/option-test.c | 4 | ||||
| -rw-r--r-- | tests/slice-test.c | 2 |
4 files changed, 18 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2006-04-05 Behdad Esfahbod <behdad@gnome.org> + + * tests/option-test.c: Check the return value of g_get_prgname for + NULL before passing to strcmp. + + * tests/slice-test.c: Report the correct name in Usage summary. + 2006-04-05 Matthias Clasen <mclasen@redhat.com> * tests/run-collate-tests.sh: Fix up shell script. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 1a581cf6a..b047a8b84 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,10 @@ +2006-04-05 Behdad Esfahbod <behdad@gnome.org> + + * tests/option-test.c: Check the return value of g_get_prgname for + NULL before passing to strcmp. + + * tests/slice-test.c: Report the correct name in Usage summary. + 2006-04-05 Matthias Clasen <mclasen@redhat.com> * tests/run-collate-tests.sh: Fix up shell script. diff --git a/tests/option-test.c b/tests/option-test.c index cd3a01ad6..48dd2531f 100644 --- a/tests/option-test.c +++ b/tests/option-test.c @@ -916,6 +916,7 @@ empty_test1 (void) GOptionContext *context; GOptionEntry entries [] = { { NULL } }; + char *prgname; g_set_prgname (NULL); context = g_option_context_new (NULL); @@ -924,7 +925,8 @@ empty_test1 (void) g_option_context_parse (context, NULL, NULL, NULL); - g_assert (strcmp (g_get_prgname (), "<unknown>") == 0); + prgname = g_get_prgname (); + g_assert (prgname && strcmp (prgname, "<unknown>") == 0); g_option_context_free (context); } diff --git a/tests/slice-test.c b/tests/slice-test.c index 9c39b666a..52d9572ad 100644 --- a/tests/slice-test.c +++ b/tests/slice-test.c @@ -189,7 +189,7 @@ test_sliced_mem_thread (gpointer data) static void usage (void) { - g_print ("Usage: gslicedmemory [n_threads] [G|S|M|O][f][c] [maxblocksize] [seed]\n"); + g_print ("Usage: slice-test [n_threads] [G|S|M|O][f][c] [maxblocksize] [seed]\n"); } int |