[TestDataFormatterUnordered] Use patterns to match unordered_<multi>set elements

[sivachandra]

Summary

This fixes the test for i386 targets.

[sivachandra]

Update arg name of a function.

[chaoren]

test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py

64–69

Could you please add a space after each comma for readability? It'd be even nicer if they're all lined up.

[sivachandra]

test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py

64–69

I thought about it. If I add spaces here, would be odd if I do not add for lines 64 and 65. However, these lines are beyond the scope of this patch IMO.

That said, anything for an LGTM: Should I only update 66-69, or all of 64-69?

[chaoren]

I think it makes sense to update 64 and 65 as well.

[sivachandra]

Improve readability per review comments.

[chaoren]

For reference, 23.2.5-6 of n3337:

the absolute order of elements in an unordered container is not specified

test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py

66

'\[\d\] = 3','\[\d\] = 3','\[\d\] = 3'

It's kind of meaning less to have three of these now. But I can't think of a good way to assert 3 distinct matches.

67

Same problem here.

[clayborg]

Looks good.

[sivachandra]

Take care of repeating patterns when printing multisets.

[chaoren]

test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py

68

'\[\d\] = 3(\\n|.)+\[\d\] = 3(\\n|.)+\[\d\] = 3'

How about

`(\[\d\] = 3(\\n|.)+){3}`

Instead?

69

(\[\d\] = "is"(\\n|.)+){2}

instead of

\[\d\] = "is"(\\n|.)+\[\d\] = "is"

test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py

def test_with_dwarf_and_run_command(self):
         """Test data formatter commands."""
         self.buildDwarf()
         self.data_formatter_commands()
 
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
 
-    def look_for_content_and_continue(self,var_name,substrs):
-        self.expect( ("frame variable %s" % var_name), substrs=substrs)
+    def look_for_content_and_continue(self, var_name, patterns):
+        self.expect( ("frame variable %s" % var_name), patterns=patterns)
         self.runCmd("continue")
 
     def data_formatter_commands(self):
         """Test that that file and class static variables display correctly."""
         self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
 
         lldbutil.run_break_set_by_source_regexp (self, "Set break point at this line.")
 
def data_formatter_commands(self):
             self.runCmd('type synth clear', check=False)
             self.runCmd("settings set target.max-children-count 256", check=False)
 
         # Execute the cleanup function during test case tear down.
         self.addTearDownHook(cleanup)
 
         self.expect('image list', substrs = self.getLibcPlusPlusLibs())
 
-        self.look_for_content_and_continue("map",['size=5 {', 'hello','world','this','is','me'])
-        self.look_for_content_and_continue("mmap",['size=6 {','first = 3','second = "this"','first = 2','second = "hello"'])
-        self.look_for_content_and_continue("iset",['size=5 {','[0] = 5','[2] = 3','[3] = 2'])
-        self.look_for_content_and_continue("sset",['size=5 {','[0] = "is"','[1] = "world"','[4] = "hello"'])
-        self.look_for_content_and_continue("imset",['size=6 {','[0] = 3','[1] = 3','[2] = 3','[4] = 2','[5] = 1'])
-        self.look_for_content_and_continue("smset",['size=5 {','[0] = "is"','[1] = "is"','[2] = "world"','[3] = "world"'])
+        self.look_for_content_and_continue("map", ['size=5 {', 'hello', 'world', 'this', 'is', 'me'])
+        self.look_for_content_and_continue("mmap", ['size=6 {', 'first = 3', 'second = "this"', 'first = 2', 'second = "hello"'])
+        self.look_for_content_and_continue("iset", ['size=5 {', '\[\d\] = 5', '\[\d\] = 3', '\[\d\] = 2'])
+        self.look_for_content_and_continue("sset", ['size=5 {', '\[\d\] = "is"', '\[\d\] = "world"', '\[\d\] = "hello"'])
+        self.look_for_content_and_continue("imset", ['size=6 {', '\[\d\] = 3(\\n|.)+\[\d\] = 3(\\n|.)+\[\d\] = 3', '\[\d\] = 2', '\[\d\] = 1'])
+        self.look_for_content_and_continue("smset", ['size=5 {', '\[\d\] = "is"(\\n|.)+\[\d\] = "is"', '\[\d\] = "world"(\\n|.)+\[\d\] = "world"'])
 
 if __name__ == '__main__':
     import atexit
     lldb.SBDebugger.Initialize()
     atexit.register(lambda: lldb.SBDebugger.Terminate())
     unittest2.main()