From: Ryan Lortie <desrt@desrt.ca>
Date: Fri, 29 Aug 2008 06:02:47 +0000 (+0000)
Subject: Fixup for test case in previous commit.
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=2edf928499ee5dcfe32cb681b584d245da331d77;p=dana%2Fcg-glib.git

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
---

diff --git a/ChangeLog b/ChangeLog
index 628e7920..881295c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/glib/tests/strfuncs.c b/glib/tests/strfuncs.c
index 30b58c4a..8928ae65 100644
--- a/glib/tests/strfuncs.c
+++ b/glib/tests/strfuncs.c
@@ -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);