Changeset 235404 in webkit

Timestamp:

Aug 27, 2018 3:19:52 PM (6 years ago)

Author:

dbates@webkit.org

Message:

Partial revert of r235376
​https://bugs.webkit.org/show_bug.cgi?id=189011

For now revert the unit tests added in r235376 as the following tests are failing on Apple Sierra
Debug and Apple High Sierra Debug bots:

lldb_webkit_unittest.TestSummaryProviders.serial_test_WTFOptionSetProvider_simple
lldb_webkit_unittest.TestSummaryProviders.serial_test_WTFOptionSet_SummaryProvider_simple

Will investigate offline.

• lldb/lldbWebKitTester/main.cpp:

(testSummaryProviders):

• lldb/lldb_webkit_unittest.py:

(TestSummaryProviders.serial_test_WTFHashSet_tablesize_and_size):
(TestSummaryProviders.serial_test_WTFOptionSet_SummaryProvider_empty): Deleted.
(TestSummaryProviders.serial_test_WTFOptionSet_SummaryProvider_simple): Deleted.
(TestSummaryProviders.serial_test_WTFOptionSetProvider_empty): Deleted.
(TestSummaryProviders.serial_test_WTFOptionSetProvider_simple): Deleted.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• lldb/lldbWebKitTester/main.cpp (modified) (3 diffs)
• lldb/lldb_webkit_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-08-27  Daniel Bates  <dabates@apple.com>
+
+        Partial revert of r235376
+        https://bugs.webkit.org/show_bug.cgi?id=189011
+
+        For now revert the unit tests added in r235376 as the following tests are failing on Apple Sierra
+        Debug and Apple High Sierra Debug bots:
+
+            lldb_webkit_unittest.TestSummaryProviders.serial_test_WTFOptionSetProvider_simple
+            lldb_webkit_unittest.TestSummaryProviders.serial_test_WTFOptionSet_SummaryProvider_simple
+
+        Will investigate offline.
+
+        * lldb/lldbWebKitTester/main.cpp:
+        (testSummaryProviders):
+        * lldb/lldb_webkit_unittest.py:
+        (TestSummaryProviders.serial_test_WTFHashSet_tablesize_and_size):
+        (TestSummaryProviders.serial_test_WTFOptionSet_SummaryProvider_empty): Deleted.
+        (TestSummaryProviders.serial_test_WTFOptionSet_SummaryProvider_simple): Deleted.
+        (TestSummaryProviders.serial_test_WTFOptionSetProvider_empty): Deleted.
+        (TestSummaryProviders.serial_test_WTFOptionSetProvider_simple): Deleted.
+
 2018-08-27  Aditya Keerthi  <akeerthi@apple.com>
 

trunk/Tools/lldb/lldbWebKitTester/main.cpp

@@ -28 +28 @@
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
-#include <wtf/OptionSet.h>
 #include <wtf/Vector.h>
 #include <wtf/text/StringBuilder.h>
@@ -45 +44 @@
     return builder.toString();
 }
-
-enum class ExampleFlags {
-    A = 1 << 0,
-    B = 1 << 1,
-    C = 1 << 2,
-    D = 1 << 3,
-};
 
 static void testSummaryProviders()
@@ -82 +74 @@
     hashMapOfVectors.add(1, Vector<int>({2, 3}));
 
-    OptionSet<ExampleFlags> exampleFlagsEmpty;
-    OptionSet<ExampleFlags> exampleFlagsSimple { ExampleFlags::A, ExampleFlags::D, ExampleFlags::C };
-
     breakForTestingSummaryProviders();
 }

trunk/Tools/lldb/lldb_webkit_unittest.py

@@ -168 +168 @@
         summary = lldb_webkit.WTFHashSet_SummaryProvider(variable, {})
         self.assertEqual(summary, "{ tableSize = 8, keyCount = 1 }")
-
-    # MARK: WTFOptionSet_SummaryProvider test cases
-
-    def serial_test_WTFOptionSet_SummaryProvider_empty(self):
-        variable = self._sbFrame.FindVariable('exampleFlagsEmpty')
-        summary = lldb_webkit.WTFOptionSet_SummaryProvider(variable, {})
-        self.assertEqual(summary, "{ size = 0 }")
-
-    def serial_test_WTFOptionSet_SummaryProvider_simple(self):
-        variable = self._sbFrame.FindVariable('exampleFlagsSimple')
-        summary = lldb_webkit.WTFOptionSet_SummaryProvider(variable, {})
-        self.assertEqual(summary, "{ size = 3 }")
-
-    # MARK: WTFOptionSetProvider test cases
-
-    def serial_test_WTFOptionSetProvider_empty(self):
-        variable = self._sbFrame.FindVariable('exampleFlagsEmpty')
-        provider = lldb_webkit.WTFOptionSetProvider(variable, {})
-        self.assertEqual(provider.get_child_at_index(0), None)
-
-    def serial_test_WTFOptionSetProvider_simple(self):
-        variable = self._sbFrame.FindVariable('exampleFlagsSimple')
-        provider = lldb_webkit.WTFOptionSetProvider(variable, {})
-        self.assertEqual(provider.get_child_at_index(0).GetName(), 'A')
-        self.assertEqual(provider.get_child_at_index(0).GetValue(), '1')
-        self.assertEqual(provider.get_child_at_index(1).GetName(), 'C')
-        self.assertEqual(provider.get_child_at_index(1).GetValue(), '4')
-        self.assertEqual(provider.get_child_at_index(2).GetName(), 'D')
-        self.assertEqual(provider.get_child_at_index(2).GetValue(), '8')