Attachment 117327 Details for Bug 91443 – Fix tests crashing with GCC 5.1

[patch] Fix tests crashing with GCC 5.1

0001-Fix-tests-crashing-with-GCC-5.1.patch (text/plain), 8.31 KB, created by Robert Ancell on 2015-07-24 04:19:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Ancell

Created: 2015-07-24 04:19:03 UTC

Size: 8.31 KB

patch

obsolete

>From 934cead2e3545e823aecac871974b28131d055e6 Mon Sep 17 00:00:00 2001
>From: Robert Ancell <robert.ancell@canonical.com>
>Date: Fri, 24 Jul 2015 16:14:11 +1200
>Subject: [PATCH] Fix tests crashing with GCC 5.1
>
>The tests were using a c_str() result from a std::string that had gone out of
>scope. GCC 5.1 seems to be more agressive in freeing the string data before
>the tests checked against it.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=91443
>---
> extensions/fts++/test/test-stringutils.cpp | 138 +++++++++++++++++++----------
> 1 file changed, 91 insertions(+), 47 deletions(-)
>
>diff --git a/extensions/fts++/test/test-stringutils.cpp b/extensions/fts++/test/test-stringutils.cpp
>index 7bb34fe..98c868e 100644
>--- a/extensions/fts++/test/test-stringutils.cpp
>+++ b/extensions/fts++/test/test-stringutils.cpp
>@@ -45,42 +45,66 @@ teardown (Fixture *fix, gconstpointer data)
> static void
> test_truncate (Fixture *fix, gconstpointer data)
> {
>-  g_assert_cmpstr ("", ==, StringUtils::Truncate("").c_str ());
>-
>-  g_assert_cmpstr ("", ==, StringUtils::Truncate("a", 0).c_str ());
>-  g_assert_cmpstr ("a", ==, StringUtils::Truncate("a", 1).c_str ());
>-  g_assert_cmpstr ("a", ==, StringUtils::Truncate("a").c_str ());
>-
>-  g_assert_cmpstr ("", ==, StringUtils::Truncate("aa", 0).c_str ());
>-  g_assert_cmpstr ("a", ==, StringUtils::Truncate("aa", 1).c_str ());
>-  g_assert_cmpstr ("aa", ==, StringUtils::Truncate("aa", 2).c_str ());
>-  g_assert_cmpstr ("aa", ==, StringUtils::Truncate("aa").c_str ());
>-
>-
>-  g_assert_cmpstr ("", ==, StringUtils::Truncate("Ã¥", 0).c_str ());
>-  g_assert_cmpstr ("", ==, StringUtils::Truncate("Ã¥", 1).c_str ());
>-  g_assert_cmpstr ("Ã¥", ==, StringUtils::Truncate("Ã¥").c_str ());
>-
>-  g_assert_cmpstr ("", ==, StringUtils::Truncate("Ã¥Ã¥", 0).c_str ());
>-  g_assert_cmpstr ("", ==, StringUtils::Truncate("Ã¥Ã¥", 1).c_str ());
>-  g_assert_cmpstr ("Ã¥", ==, StringUtils::Truncate("Ã¥Ã¥", 2).c_str ());
>-  g_assert_cmpstr ("Ã¥", ==, StringUtils::Truncate("Ã¥Ã¥", 3).c_str ());
>-  g_assert_cmpstr ("Ã¥Ã¥", ==, StringUtils::Truncate("Ã¥Ã¥", 4).c_str ());
>-  g_assert_cmpstr ("Ã¥Ã¥", ==, StringUtils::Truncate("Ã¥Ã¥").c_str ());
>+  std::string truncated;
>+
>+  truncated = StringUtils::Truncate("");
>+  g_assert_cmpstr ("", ==, truncated.c_str ());
>+
>+  truncated = StringUtils::Truncate("a", 0);
>+  g_assert_cmpstr ("", ==, truncated.c_str ());
>+  truncated = StringUtils::Truncate("a", 1);
>+  g_assert_cmpstr ("a", ==, truncated.c_str ());
>+  truncated = StringUtils::Truncate("a");
>+  g_assert_cmpstr ("a", ==, truncated.c_str ());
>+
>+  truncated = StringUtils::Truncate("aa", 0);
>+  g_assert_cmpstr ("", ==, truncated.c_str ());
>+  truncated = StringUtils::Truncate("aa", 1);
>+  g_assert_cmpstr ("a", ==, truncated.c_str ());
>+  truncated = StringUtils::Truncate("aa", 2);
>+  g_assert_cmpstr ("aa", ==, truncated.c_str ());
>+  truncated = StringUtils::Truncate("aa");
>+  g_assert_cmpstr ("aa", ==, truncated.c_str ());
>+
>+
>+  truncated = StringUtils::Truncate("Ã¥", 0);
>+  g_assert_cmpstr ("", ==, truncated.c_str ());
>+  truncated = StringUtils::Truncate("Ã¥", 1);
>+  g_assert_cmpstr ("", ==, truncated.c_str ());
>+  truncated = StringUtils::Truncate("Ã¥");
>+  g_assert_cmpstr ("Ã¥", ==, truncated.c_str ());
>+
>+  truncated = StringUtils::Truncate("Ã¥Ã¥", 0);
>+  g_assert_cmpstr ("", ==, truncated.c_str ());
>+  truncated = StringUtils::Truncate("Ã¥Ã¥", 1);
>+  g_assert_cmpstr ("", ==, truncated.c_str ());
>+  truncated = StringUtils::Truncate("Ã¥Ã¥", 2);
>+  g_assert_cmpstr ("Ã¥", ==, truncated.c_str ());
>+  truncated = StringUtils::Truncate("Ã¥Ã¥", 3);
>+  g_assert_cmpstr ("Ã¥", ==, truncated.c_str ());
>+  truncated = StringUtils::Truncate("Ã¥Ã¥", 4);
>+  g_assert_cmpstr ("Ã¥Ã¥", ==, truncated.c_str ());
>+  truncated = StringUtils::Truncate("Ã¥Ã¥");
>+  g_assert_cmpstr ("Ã¥Ã¥", ==, truncated.c_str ());
> }
> 
> static void
> test_mangle (Fixture *fix, gconstpointer data)
> {
>-  g_assert_cmpstr ("", ==, StringUtils::MangleUri("").c_str ());
>+  std::string mangled;
>+
>+  mangled = StringUtils::MangleUri("");
>+  g_assert_cmpstr ("", ==, mangled.c_str ());
> 
>-  g_assert_cmpstr ("file", ==, StringUtils::MangleUri("file").c_str ());
>-  g_assert_cmpstr ("file___", ==, StringUtils::MangleUri("file://").c_str ());
>-  g_assert_cmpstr ("http___www_zeitgeist_project_com", ==,
>-      StringUtils::MangleUri("http://www.zeitgeist-project.com").c_str ());
>+  mangled = StringUtils::MangleUri("file");
>+  g_assert_cmpstr ("file", ==, mangled.c_str ());
>+  mangled = StringUtils::MangleUri("file://");
>+  g_assert_cmpstr ("file___", ==, mangled.c_str ());
>+  mangled = StringUtils::MangleUri("http://www.zeitgeist-project.com");
>+  g_assert_cmpstr ("http___www_zeitgeist_project_com", ==, mangled.c_str ());
> 
>-  g_assert_cmpstr ("scheme_no_spaces_in_uris", ==,
>-      StringUtils::MangleUri("scheme:no spaces in uris").c_str ());
>+  mangled = StringUtils::MangleUri("scheme:no spaces in uris");
>+  g_assert_cmpstr ("scheme_no_spaces_in_uris", ==, mangled.c_str ());
> }
> 
> static void
>@@ -189,44 +213,64 @@ test_ascii_fold (Fixture *fix, gconstpointer data)
> static void
> test_underscores (Fixture *fix, gconstpointer data)
> {
>-  g_assert_cmpstr ("", ==, StringUtils::RemoveUnderscores ("").c_str ());
>+  std::string s;
> 
>-  g_assert_cmpstr (" ", ==, StringUtils::RemoveUnderscores ("_").c_str ());
>+  s = StringUtils::RemoveUnderscores ("");
>+  g_assert_cmpstr ("", ==, s.c_str ());
> 
>-  g_assert_cmpstr ("   ", ==, StringUtils::RemoveUnderscores ("___").c_str ());
>+  s = StringUtils::RemoveUnderscores ("_");
>+  g_assert_cmpstr (" ", ==, s.c_str ());
> 
>-  g_assert_cmpstr ("abcd", ==, StringUtils::RemoveUnderscores ("abcd").c_str ());
>+  s = StringUtils::RemoveUnderscores ("___");
>+  g_assert_cmpstr ("   ", ==, s.c_str ());
> 
>-  g_assert_cmpstr (" abcd ", ==, StringUtils::RemoveUnderscores ("_abcd_").c_str ());
>+  s = StringUtils::RemoveUnderscores ("abcd");
>+  g_assert_cmpstr ("abcd", ==, s.c_str ());
> 
>-  g_assert_cmpstr ("a b c d", ==, StringUtils::RemoveUnderscores ("a_b_c_d").c_str ());
>+  s = StringUtils::RemoveUnderscores ("_abcd_");
>+  g_assert_cmpstr (" abcd ", ==, s.c_str ());
>+
>+  s = StringUtils::RemoveUnderscores ("a_b_c_d");
>+  g_assert_cmpstr ("a b c d", ==, s.c_str ());
> }
> 
> static void
> test_uncamelcase (Fixture *fix, gconstpointer data)
> {
>-  g_assert_cmpstr ("", ==, StringUtils::UnCamelcase ("").c_str ());
>+  std::string s;
>+
>+  s = StringUtils::UnCamelcase ("");
>+  g_assert_cmpstr ("", ==, s.c_str ());
> 
>-  g_assert_cmpstr ("abcd", ==, StringUtils::UnCamelcase ("abcd").c_str ());
>+  s = StringUtils::UnCamelcase ("abcd");
>+  g_assert_cmpstr ("abcd", ==, s.c_str ());
> 
>-  g_assert_cmpstr ("Abcd", ==, StringUtils::UnCamelcase ("Abcd").c_str ());
>+  s = StringUtils::UnCamelcase ("Abcd");
>+  g_assert_cmpstr ("Abcd", ==, s.c_str ());
> 
>-  g_assert_cmpstr ("ABCD", ==, StringUtils::UnCamelcase ("ABCD").c_str ());
>+  s = StringUtils::UnCamelcase ("ABCD");
>+  g_assert_cmpstr ("ABCD", ==, s.c_str ());
> 
>-  g_assert_cmpstr ("ABcd", ==, StringUtils::UnCamelcase ("ABcd").c_str ());
>+  s = StringUtils::UnCamelcase ("ABcd");
>+  g_assert_cmpstr ("ABcd", ==, s.c_str ());
> 
>-  g_assert_cmpstr ("Abcd Ef", ==, StringUtils::UnCamelcase ("AbcdEf").c_str ());
>+  s = StringUtils::UnCamelcase ("AbcdEf");
>+  g_assert_cmpstr ("Abcd Ef", ==, s.c_str ());
> 
>-  g_assert_cmpstr ("Text Editor", ==, StringUtils::UnCamelcase ("Text Editor").c_str ());
>+  s = StringUtils::UnCamelcase ("Text Editor");
>+  g_assert_cmpstr ("Text Editor", ==, s.c_str ());
> 
>-  g_assert_cmpstr ("py Karaoke", ==, StringUtils::UnCamelcase ("pyKaraoke").c_str ());
>+  s = StringUtils::UnCamelcase ("pyKaraoke");
>+  g_assert_cmpstr ("py Karaoke", ==, s.c_str ());
> 
>-  g_assert_cmpstr ("Zeitgeist Project", ==, StringUtils::UnCamelcase ("ZeitgeistProject").c_str ());
>+  s = StringUtils::UnCamelcase ("ZeitgeistProject");
>+  g_assert_cmpstr ("Zeitgeist Project", ==, s.c_str ());
> 
>-  g_assert_cmpstr ("Very Nice Camel Case Text", ==, StringUtils::UnCamelcase ("VeryNiceCamelCaseText").c_str ());
>+  s = StringUtils::UnCamelcase ("VeryNiceCamelCaseText");
>+  g_assert_cmpstr ("Very Nice Camel Case Text", ==, s.c_str ());
> 
>-  g_assert_cmpstr ("ÅeedÅ¡ Å¤o WÃ³rk ÃÅ Ãtf ÄhÃ¡Åacters As WelL", ==,
>-      StringUtils::UnCamelcase ("ÅeedÅ¡Å¤oWÃ³rkÃÅÃtfÄhÃ¡ÅactersAsWelL").c_str ());
>+  s = StringUtils::UnCamelcase ("ÅeedÅ¡Å¤oWÃ³rkÃÅÃtfÄhÃ¡ÅactersAsWelL");
>+  g_assert_cmpstr ("ÅeedÅ¡ Å¤o WÃ³rk ÃÅ Ãtf ÄhÃ¡Åacters As WelL", ==, s.c_str ());
> }
> 
> static void
>-- 
>2.4.6
>

Actions: View | Splinter Review

Attachments on bug 91443: 117327

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.