Merge pull request #10570 from adrian-prantl/unbreak-testsuite

Unbreak testsuite

Author: shahmishal

lldb/test/API/lang/swift/unknown_reference/TestSwiftUnknownReference.py

@@ -21,7 +21,7 @@ class TestSwiftUnknownReference(lldbtest.TestBase):
     mydir = lldbtest.TestBase.compute_mydir(__file__)
 
     def check_class(self, var_self):
-        lldbutil.check_variable(self, var_self, num_children=2)
+        lldbutil.check_variable(self, var_self, use_dynamic=True, num_children=2)
         m_base_string = var_self.GetChildMemberWithName("base_string")
         m_string = var_self.GetChildMemberWithName("string")
         lldbutil.check_variable(self, m_base_string, summary='"hello"')

lldb/test/API/lang/swift/unknown_self/TestSwiftUnknownSelf.py

@@ -20,7 +20,9 @@ class TestSwiftUnknownSelf(lldbtest.TestBase):
 
     def check_class(self, var_self, weak):
         self.expect("v self", substrs=["hello", "world"])
-        lldbutil.check_variable(self, var_self, num_children=2)
+        # FIXME: This is inconsistent. If self is Optional, an extra
+        #        indirection is needed.
+        lldbutil.check_variable(self, var_self, num_children=2 if weak else 1)
         m_base_string = var_self.GetChildMemberWithName("base_string")
         m_string = var_self.GetChildMemberWithName("string")
         # FIXME: This is inconsistent. If self is Optional, an extra

lldb/test/Shell/Settings/TestCxxFrameFormat.test

@@ -24,7 +24,7 @@ int main(int argc, char const *argv[]) {
 #--- commands.input
 settings set plugin.cplusplus.display.function-name-format "${function.scope}${function.basename}"
 settings set -f frame-format "custom-frame '${function.name-with-args}'\n"
-break set -l 3
+break set -l 3 -f main.cpp
 
 run
 bt

lldb/test/Shell/Settings/TestCxxFrameFormatObjC.test

@@ -17,7 +17,7 @@ int main() { return bar(10); }
 #--- commands.input
 settings set plugin.cplusplus.display.function-name-format "this affects C++ only"
 settings set -f frame-format "custom-frame '${function.name-with-args}'\n"
-break set -l 3
+break set -l 3 -f main.m
 run
 
 bt

lldb/test/Shell/Settings/TestCxxFrameFormatPartialFailure.test

@@ -22,7 +22,7 @@ int main(int argc, const char *argv[]) {
 #--- commands.input
 settings set plugin.cplusplus.display.function-name-format "${function.basename}${script.target:invalid_func}"
 settings set -f frame-format "custom-frame '${function.name-with-args}'\n"
-break set -l 2
+break set -l 2 -f main.cpp
 
 run
 bt

lldb/test/Shell/Settings/TestFrameFormatFunctionBasename.test

@@ -42,7 +42,7 @@ int main() {
 
 #--- commands.input
 settings set -f frame-format "custom-frame '${function.basename}'\n"
-break set -l 5
+break set -n bar
 
 run
 bt

lldb/test/Shell/Settings/TestFrameFormatFunctionTemplateArguments.test

@@ -33,7 +33,7 @@ int main() { return bar(); }
 
 #--- commands.input
 settings set -f frame-format "custom-frame '${function.template-arguments}'\n"
-break set -l 4
+break set -n func
 
 run
 bt