[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d
kenneth at webkit.org
kenneth at webkit.org
Thu Dec 3 13:36:23 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 506fbfda629092233c35fb98a891011b71ec6158
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 13 20:50:33 2009 +0000
WebKitTools: Make the Qt Linux only --valgrind feature, suppress errors
defined in the SuppressedValgrindErrors file.
Reviewed by Simon Hausmann.
* Scripts/run-webkit-tests:
LayoutTests: Add a file for suppressing invalid valgrind errors (Qt / Linux only)
Reviewed by Simon Hausmann.
* platform/qt/SuppressedValgrindErrors: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50965 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1f8300e..d5ac784 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-13 Kenneth Rohde Christiansen <kenneth at webkit.org>
+
+ Reviewed by Simon Hausmann.
+
+ Add a file for suppressing invalid valgrind errors (Qt / Linux only)
+
+ * platform/qt/SuppressedValgrindErrors: Added.
+
2009-11-13 Alexey Proskuryakov <ap at apple.com>
Disable websocket tests on Windows, as the server cannot start on buildbot.
diff --git a/LayoutTests/platform/qt/SuppressedValgrindErrors b/LayoutTests/platform/qt/SuppressedValgrindErrors
new file mode 100644
index 0000000..b3d8408
--- /dev/null
+++ b/LayoutTests/platform/qt/SuppressedValgrindErrors
@@ -0,0 +1,16 @@
+{
+ <insert a suppression name here>
+ Memcheck:Cond
+ fun:_ZN3JSC4Heap18markConservativelyERNS_9MarkStackEPvS3_
+ fun:_ZN3JSC4Heap39markCurrentThreadConservativelyInternalERNS_9MarkStackE
+ fun:_ZN3JSC4Heap31markCurrentThreadConservativelyERNS_9MarkStackE
+ fun:_ZN3JSC4Heap7collectEv
+ fun:_ZN7WebCore12GCController12gcTimerFiredEPNS_5TimerIS0_EE
+ fun:_ZN7WebCore12ThreadTimers24sharedTimerFiredInternalEv
+ fun:_ZN7WebCore13SharedTimerQtD0Ev
+ fun:_ZN14QObjectPrivate14deleteChildrenEv
+ fun:_ZN7QObjectD2Ev
+ fun:_ZN16QCoreApplicationD2Ev
+ fun:_ZN12QApplicationD1Ev
+ fun:main
+}
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ec1b6d5..f94a265 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,15 @@
Reviewed by Simon Hausmann.
+ Make the Qt Linux only --valgrind feature, suppress errors
+ defined in the SuppressedValgrindErrors file.
+
+ * Scripts/run-webkit-tests:
+
+2009-11-13 Kenneth Rohde Christiansen <kenneth at webkit.org>
+
+ Reviewed by Simon Hausmann.
+
Set the locale to C and not to the current one in use on the system.
* DumpRenderTree/qt/DumpRenderTree.cpp:
diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index 78c6ed2..e45c2db 100755
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -1267,7 +1267,7 @@ sub openDumpTool()
}
if ($useValgrind) {
- unshift @args, "valgrind";
+ unshift @args, "valgrind", "--suppressions=$platformBaseDirectory/qt/SuppressedValgrindErrors";
}
$ENV{MallocStackLogging} = 1 if $shouldCheckLeaks;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list