Fixup for test case in previous commit.

2008-08-28  Ryan Lortie  <desrt@desrt.ca>

        Fixup for test case in previous commit.

        * glib/tests/strfuncs.c: don't fail if we can't open the test data.
        This happens if $(builddir) != $(srcdir) (like when doing 'make
        distcheck').  Quick workaround for now until #549783 can be fixed.


svn path=/trunk/; revision=7415
This commit is contained in:
Ryan Lortie 2008-08-29 06:02:47 +00:00 committed by Ryan Lortie
parent 2cf0f4853a
commit 2edf928499
2 changed files with 14 additions and 1 deletions

View File

@ -1,6 +1,14 @@
2008-08-28 Ryan Lortie <desrt@desrt.ca>
[REVERT] Bug 548612 g_strstr_len() should use memmem when available
Fixup for test case in previous commit.
* glib/tests/strfuncs.c: don't fail if we can't open the test data.
This happens if $(builddir) != $(srcdir) (like when doing 'make
distcheck'). Quick workaround for now until #549783 can be fixed.
2008-08-28 Ryan Lortie <desrt@desrt.ca>
Bug 548612 g_strstr_len() should use memmem when available
* glib/gstrfuncs.c (g_strstr_len): fix off-by-one memory access error
* glib/tests/strfuncs.c (test_bounds): add some new test cases that

View File

@ -1062,6 +1062,11 @@ test_bounds (void)
* side.
*/
before = g_mapped_file_new ("4096-random-bytes", TRUE, NULL);
/* quick workaround until #549783 can be fixed */
if (before == NULL)
return;
file = g_mapped_file_new ("4096-random-bytes", TRUE, NULL);
after = g_mapped_file_new ("4096-random-bytes", TRUE, NULL);
g_mapped_file_free (before);