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: https://svn.webkit.org/repository/webkit/trunk@50965 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1f8300ef537bf4f5287897ca24d7b7270c05d2ee..d5ac78418cb4b4f09190970d9daea23bc7ab75ba 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-13  Kenneth Rohde Christiansen  <kenneth@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@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 (file)
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 ec1b6d54af13daacac38a2cc53c1ebc04ddc946c..f94a265826e4e76d55bf300e80788da841847ea9 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-13  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+
+        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@webkit.org>
 
         Reviewed by Simon Hausmann.

diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index 78c6ed2482edb7ece1501c4b7728d1ac749f7ada..e45c2db2ac1ea965e47b38b47e107431043393ca 100755 (executable)
--- 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;