summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaximiliano Curia <maxy@debian.org>2014-01-14 00:03:22 -0300
committerMaximiliano Curia <maxy@debian.org>2014-01-14 00:03:22 -0300
commit90f17b325210be7e2ed7262c979e5b48a08d3956 (patch)
tree87c845417ffc0ea4dc3d66a9f9efe076a8db0bc2
parentbb6025dd2cd08a55ccb3abc820747625a35b0247 (diff)
downloadkde4libs-90f17b325210be7e2ed7262c979e5b48a08d3956.tar.gz
New patch: disable_bogus_test.diff
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/disable_bogus_test.diff22
-rw-r--r--debian/patches/series1
3 files changed, 24 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 728c7ef..138d93b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ kde4libs (4:4.11.5-1) UNRELEASED; urgency=low
* Add autopkgtest.
* New patch: debian_standardsdirtest.diff
* New patch: kstringhandlertest_fix.diff
+ * New patch: disable_bogus_test.diff
-- Maximiliano Curia <maxy@debian.org> Thu, 09 Jan 2014 12:14:52 -0300
diff --git a/debian/patches/disable_bogus_test.diff b/debian/patches/disable_bogus_test.diff
new file mode 100644
index 0000000..d381729
--- /dev/null
+++ b/debian/patches/disable_bogus_test.diff
@@ -0,0 +1,22 @@
+Index: kde4libs/kdecore/tests/kmimetype_nomimetypes.cpp
+===================================================================
+--- kde4libs.orig/kdecore/tests/kmimetype_nomimetypes.cpp 2014-01-13 11:27:40.562481097 -0300
++++ kde4libs/kdecore/tests/kmimetype_nomimetypes.cpp 2014-01-14 00:02:04.617982091 -0300
+@@ -53,11 +53,12 @@
+ KMessage::setMessageHandler(msgHandler);
+
+ KMimeType::Ptr s0 = KMimeType::mimeType("application/x-zerosize");
+- Q_ASSERT(!s0); // should NOT be found, otherwise this test is bogus!
+- if (s0) {
+- abort();
+- return 1;
+- }
++ // Bogus test
++ // Q_ASSERT(!s0); // should NOT be found, otherwise this test is bogus!
++ // if (s0) {
++ // abort();
++ // return 1;
++ // }
+
+ KMimeType::Ptr mime = KMimeType::findByUrl(KUrl("/"));
+ Q_ASSERT(mime);
diff --git a/debian/patches/series b/debian/patches/series
index 7fa105f..44424b1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,3 +26,4 @@ cmake_compatibility.diff
kde4libs_interpret_qvarianttype_as_qmetatypetype.diff
debian_standardsdirtest.diff
kstringhandlertest_fix.diff
+disable_bogus_test.diff