[Lldb-commits] [lldb] 904d54d - [lldb/Test] Sort substr for TestDataFormatterStdMap.py (2/2)

[Jonas Devlieghere via lldb-commits]

Author: Jonas Devlieghere
Date: 2020-02-03T20:59:21-08:00
New Revision: 904d54de9ba9f71e937b24e04ad5941281cd50b7

URL: https://github.com/llvm/llvm-project/commit/904d54de9ba9f71e937b24e04ad5941281cd50b7
DIFF: https://github.com/llvm/llvm-project/commit/904d54de9ba9f71e937b24e04ad5941281cd50b7.diff

LOG: [lldb/Test] Sort substr for TestDataFormatterStdMap.py (2/2)

Added: 
    

Modified: 
    lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py

Removed: 
    


################################################################################
diff  --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
index 0e32e49f73ae..861b24b3a08b 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
@@ -251,35 +251,25 @@ def cleanup():
 
         self.runCmd("c")
 
-        self.expect("frame variable ss",
-                    substrs=['map has 4 items',
-                             '[0] = ',
-                             'second = \"hello\"',
-                             'first = \"ciao\"',
-                             '[1] = ',
-                             'second = \"house\"',
-                             'first = \"casa\"',
-                             '[2] = ',
-                             'second = \"cat\"',
-                             'first = \"gatto\"',
-                             '[3] = ',
-                             'second = \"..is always a Mac!\"',
-                             'first = \"a Mac..\"'])
+        self.expect(
+            "frame variable ss",
+            substrs=[
+                'map has 4 items',
+                '[0] = (first = "a Mac..", second = "..is always a Mac!")',
+                '[1] = (first = "casa", second = "house")',
+                '[2] = (first = "ciao", second = "hello")',
+                '[3] = (first = "gatto", second = "cat")'
+            ])
 
-        self.expect("p ss",
-                    substrs=['map has 4 items',
-                             '[0] = ',
-                             'second = \"hello\"',
-                             'first = \"ciao\"',
-                             '[1] = ',
-                             'second = \"house\"',
-                             'first = \"casa\"',
-                             '[2] = ',
-                             'second = \"cat\"',
-                             'first = \"gatto\"',
-                             '[3] = ',
-                             'second = \"..is always a Mac!\"',
-                             'first = \"a Mac..\"'])
+        self.expect(
+            "p ss",
+            substrs=[
+                'map has 4 items',
+                '[0] = (first = "a Mac..", second = "..is always a Mac!")',
+                '[1] = (first = "casa", second = "house")',
+                '[2] = (first = "ciao", second = "hello")',
+                '[3] = (first = "gatto", second = "cat")'
+            ])
 
         # check access-by-index
         self.expect("frame variable ss[3]",