diff --git a/lldb/packages/Python/lldbsuite/test/configuration.py b/lldb/packages/Python/lldbsuite/test/configuration.py --- a/lldb/packages/Python/lldbsuite/test/configuration.py +++ b/lldb/packages/Python/lldbsuite/test/configuration.py @@ -51,8 +51,7 @@ dwarf_version = 0 # Any overridden settings. -# Always disable default dynamic types for testing purposes. -settings = [('target.prefer-dynamic-value', 'no-dynamic-values')] +settings = [] # Path to the FileCheck testing tool. Not optional. filecheck = None diff --git a/lldb/test/API/commands/expression/po_verbosity/TestPoVerbosity.py b/lldb/test/API/commands/expression/po_verbosity/TestPoVerbosity.py --- a/lldb/test/API/commands/expression/po_verbosity/TestPoVerbosity.py +++ b/lldb/test/API/commands/expression/po_verbosity/TestPoVerbosity.py @@ -41,6 +41,8 @@ self.runCmd("run", RUN_SUCCEEDED) + self.runCmd("settings set target.prefer-dynamic-value no-dynamic-values") + self.expect("expr -O -v -- foo", substrs=['(id) $', ' = 0x', '1 = 2', '2 = 3;']) self.expect("expr -O -vfull -- foo", diff --git a/lldb/test/API/commands/expression/two-files/TestObjCTypeQueryFromOtherCompileUnit.py b/lldb/test/API/commands/expression/two-files/TestObjCTypeQueryFromOtherCompileUnit.py --- a/lldb/test/API/commands/expression/two-files/TestObjCTypeQueryFromOtherCompileUnit.py +++ b/lldb/test/API/commands/expression/two-files/TestObjCTypeQueryFromOtherCompileUnit.py @@ -32,6 +32,8 @@ self.runCmd("run", RUN_SUCCEEDED) + self.runCmd("settings set target.prefer-dynamic-value no-dynamic-values") + # Now do a NSArry type query from the 'main.m' compile uint. self.expect("expression (NSArray*)array_token", substrs=['(NSArray *) $0 = 0x']) diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCCF.py b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCCF.py --- a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCCF.py +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCCF.py @@ -27,6 +27,8 @@ STOPPED_DUE_TO_BREAKPOINT, substrs=['stopped', 'stop reason = breakpoint']) + self.runCmd('settings set target.prefer-dynamic-value no-dynamic-values') + # check formatters for common Objective-C types expect_strings = [ '(CFGregorianUnits) cf_greg_units = 1 years, 3 months, 5 days, 12 hours, 5 minutes 7 seconds', diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCExpr.py b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCExpr.py --- a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCExpr.py +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCExpr.py @@ -27,6 +27,8 @@ STOPPED_DUE_TO_BREAKPOINT, substrs=['stopped', 'stop reason = breakpoint']) + self.runCmd('settings set target.prefer-dynamic-value no-dynamic-values') + # This is the function to remove the custom formats in order to have a # clean slate for the next test case. def cleanup(): diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCKVO.py b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCKVO.py --- a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCKVO.py +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCKVO.py @@ -21,6 +21,8 @@ self, '// Set break point at this line.', lldb.SBFileSpec('main.m', False)) + self.runCmd('settings set target.prefer-dynamic-value no-dynamic-values') + # The stop reason of the thread should be breakpoint. self.expect( "thread list", diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSContainer.py b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSContainer.py --- a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSContainer.py +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSContainer.py @@ -19,6 +19,8 @@ self.appkit_tester_impl(self.nscontainers_data_formatter_commands, False) def nscontainers_data_formatter_commands(self): + self.runCmd('settings set target.prefer-dynamic-value no-dynamic-values') + self.expect( 'frame variable newArray nsDictionary newDictionary nscfDictionary cfDictionaryRef newMutableDictionary copyDictionary newMutableDictionaryRef cfarray_ref mutable_array_ref', substrs=[ diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSData.py b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSData.py --- a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSData.py +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSData.py @@ -24,6 +24,8 @@ self.appkit_tester_impl(self.nsdata_data_formatter_commands, False) def nsdata_data_formatter_commands(self): + self.runCmd('settings set target.prefer-dynamic-value no-dynamic-values') + self.expect( 'frame variable immutableData mutableData data_ref mutable_data_ref mutable_string_ref concreteData concreteMutableData', substrs=[ diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSNumber.py b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSNumber.py --- a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSNumber.py +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSNumber.py @@ -24,6 +24,8 @@ self.appkit_tester_impl(self.nscontainers_data_formatter_commands, False) def nscontainers_data_formatter_commands(self): + self.runCmd('settings set target.prefer-dynamic-value no-dynamic-values') + self.expect( 'frame variable newArray nsDictionary newDictionary nscfDictionary cfDictionaryRef newMutableDictionary cfarray_ref mutable_array_ref', substrs=[ diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py --- a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py @@ -22,6 +22,8 @@ self.runCmd("run", RUN_SUCCEEDED) + self.runCmd("settings set target.prefer-dynamic-value no-dynamic-values") + # The stop reason of the thread should be breakpoint. self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, substrs=['stopped', diff --git a/lldb/test/API/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py b/lldb/test/API/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py --- a/lldb/test/API/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py +++ b/lldb/test/API/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py @@ -74,7 +74,7 @@ substrs=[ '@"0 elements"']) self.expect( - 'frame variable arr --ptr-depth 1 -d no-run-target', + 'frame variable arr --ptr-depth 1', substrs=[ '@"6 elements"', '@"hello"', @@ -84,14 +84,14 @@ '@"me"', '@"http://www.apple.com']) self.expect( - 'frame variable other_arr --ptr-depth 1 -d no-run-target', + 'frame variable other_arr --ptr-depth 1', substrs=[ '@"4 elements"', '(int)5', '@"a string"', '@"6 elements"']) self.expect( - 'frame variable other_arr --ptr-depth 2 -d no-run-target', + 'frame variable other_arr --ptr-depth 2', substrs=[ '@"4 elements"', '@"6 elements" {', diff --git a/lldb/test/API/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py b/lldb/test/API/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py --- a/lldb/test/API/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py +++ b/lldb/test/API/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py @@ -86,7 +86,7 @@ '[2] = ', '[3] = ']) self.expect( - 'frame variable dictionary --ptr-depth 1 --dynamic-type no-run-target', + 'frame variable dictionary --ptr-depth 1', substrs=[ '3 key/value pairs', '@"bar"', @@ -94,7 +94,7 @@ '@"baz"', '2 key/value pairs']) self.expect( - 'frame variable mutabledict --ptr-depth 1 --dynamic-type no-run-target', + 'frame variable mutabledict --ptr-depth 1', substrs=[ '4 key/value pairs', '(int)23', @@ -103,7 +103,7 @@ '@"sourceofstuff"', '3 key/value pairs']) self.expect( - 'frame variable mutabledict --ptr-depth 2 --dynamic-type no-run-target', + 'frame variable mutabledict --ptr-depth 2', substrs=[ '4 key/value pairs', '(int)23', @@ -114,7 +114,7 @@ '@"bar"', '@"2 elements"']) self.expect( - 'frame variable mutabledict --ptr-depth 3 --dynamic-type no-run-target', + 'frame variable mutabledict --ptr-depth 3', substrs=[ '4 key/value pairs', '(int)23', diff --git a/lldb/test/API/lang/cpp/diamond/TestCppDiamond.py b/lldb/test/API/lang/cpp/diamond/TestCppDiamond.py --- a/lldb/test/API/lang/cpp/diamond/TestCppDiamond.py +++ b/lldb/test/API/lang/cpp/diamond/TestCppDiamond.py @@ -19,6 +19,8 @@ self.build() lldbutil.run_to_source_breakpoint(self, "// breakpoint 1", lldb.SBFileSpec("main.cpp")) + self.runCmd("settings set target.prefer-dynamic-value no-dynamic-values") + j1 = self.frame().FindVariable("j1") j1_Derived1 = j1.GetChildAtIndex(0) j1_Derived2 = j1.GetChildAtIndex(1) diff --git a/lldb/test/API/lang/objc/blocks/TestObjCIvarsInBlocks.py b/lldb/test/API/lang/objc/blocks/TestObjCIvarsInBlocks.py --- a/lldb/test/API/lang/objc/blocks/TestObjCIvarsInBlocks.py +++ b/lldb/test/API/lang/objc/blocks/TestObjCIvarsInBlocks.py @@ -44,6 +44,8 @@ process.GetState(), lldb.eStateStopped, "Stopped it too.") + self.runCmd('settings set target.prefer-dynamic-value no-dynamic-values') + thread_list = lldbutil.get_threads_stopped_at_breakpoint( process, breakpoint) self.assertEqual(len(thread_list), 1) diff --git a/lldb/test/API/lang/objc/exceptions/TestObjCExceptions.py b/lldb/test/API/lang/objc/exceptions/TestObjCExceptions.py --- a/lldb/test/API/lang/objc/exceptions/TestObjCExceptions.py +++ b/lldb/test/API/lang/objc/exceptions/TestObjCExceptions.py @@ -64,7 +64,7 @@ ]) self.expect( - 'frame variable --dynamic-type no-run-target *e1', + 'frame variable *e1', substrs=[ '(NSException) *e1 = ', 'name = ', '"ExceptionName"', @@ -93,7 +93,7 @@ ]) self.expect( - 'frame variable --dynamic-type no-run-target *e2', + 'frame variable *e2', substrs=[ '(NSException) *e2 = ', 'name = ', '"ThrownException"', diff --git a/lldb/test/API/lang/objc/foundation/TestObjCMethods.py b/lldb/test/API/lang/objc/foundation/TestObjCMethods.py --- a/lldb/test/API/lang/objc/foundation/TestObjCMethods.py +++ b/lldb/test/API/lang/objc/foundation/TestObjCMethods.py @@ -124,6 +124,8 @@ self.runCmd("run", RUN_SUCCEEDED) + self.runCmd("settings set target.prefer-dynamic-value no-dynamic-values") + # The backtrace should show we stop at -[MyString description]. self.expect("thread backtrace", "Stop at -[MyString description]", substrs=["a.out`-[MyString description]"]) diff --git a/lldb/test/API/lang/objc/foundation/TestObjCMethodsString.py b/lldb/test/API/lang/objc/foundation/TestObjCMethodsString.py --- a/lldb/test/API/lang/objc/foundation/TestObjCMethodsString.py +++ b/lldb/test/API/lang/objc/foundation/TestObjCMethodsString.py @@ -19,6 +19,8 @@ self, '// Break here for NSString tests', lldb.SBFileSpec('main.m', False)) + self.runCmd("settings set target.prefer-dynamic-value no-dynamic-values") + # Test_NSString: self.runCmd("thread backtrace") self.expect("expression (int)[str length]", diff --git a/lldb/test/API/lang/objc/foundation/TestRuntimeTypes.py b/lldb/test/API/lang/objc/foundation/TestRuntimeTypes.py --- a/lldb/test/API/lang/objc/foundation/TestRuntimeTypes.py +++ b/lldb/test/API/lang/objc/foundation/TestRuntimeTypes.py @@ -31,6 +31,8 @@ self.runCmd("run", RUN_SUCCEEDED) + self.runCmd("settings set target.prefer-dynamic-value no-dynamic-values") + # The backtrace should show we stop at -[MyString description]. self.expect("thread backtrace", "Stop at -[MyString description]", substrs=["a.out`-[MyString description]"]) diff --git a/lldb/test/API/lang/objc/objc-new-syntax/TestObjCNewSyntaxLiteral.py b/lldb/test/API/lang/objc/objc-new-syntax/TestObjCNewSyntaxLiteral.py --- a/lldb/test/API/lang/objc/objc-new-syntax/TestObjCNewSyntaxLiteral.py +++ b/lldb/test/API/lang/objc/objc-new-syntax/TestObjCNewSyntaxLiteral.py @@ -54,6 +54,8 @@ def test_float_literal(self): self.runToBreakpoint() + self.runCmd("settings set target.prefer-dynamic-value no-dynamic-values") + self.expect("expr -- @123.45", VARIABLES_DISPLAYED_CORRECTLY, substrs=["NSNumber", "123.45"]) @@ -62,6 +64,8 @@ def test_expressions_in_literals(self): self.runToBreakpoint() + self.runCmd("settings set target.prefer-dynamic-value no-dynamic-values") + self.expect( "expr --object-description -- @( 1 + 3 )", VARIABLES_DISPLAYED_CORRECTLY, diff --git a/lldb/test/API/lang/objc/real-definition/TestRealDefinition.py b/lldb/test/API/lang/objc/real-definition/TestRealDefinition.py --- a/lldb/test/API/lang/objc/real-definition/TestRealDefinition.py +++ b/lldb/test/API/lang/objc/real-definition/TestRealDefinition.py @@ -28,6 +28,8 @@ # Run at stop at main lldbutil.check_breakpoint(self, bpno = 1, expected_hit_count = 1) + self.runCmd("settings set target.prefer-dynamic-value no-dynamic-values") + # This should display correctly. self.expect( "frame variable foo->_bar->_hidden_ivar", @@ -53,6 +55,8 @@ # Run at stop at main lldbutil.check_breakpoint(self, bpno = 1, expected_hit_count = 1) + self.runCmd("settings set target.prefer-dynamic-value no-dynamic-values") + # This should display correctly. self.expect( "frame variable foo->_bar->_hidden_ivar", diff --git a/lldb/test/API/sanity/TestSettingSkipping.py b/lldb/test/API/sanity/TestSettingSkipping.py --- a/lldb/test/API/sanity/TestSettingSkipping.py +++ b/lldb/test/API/sanity/TestSettingSkipping.py @@ -12,12 +12,12 @@ NO_DEBUG_INFO_TESTCASE = True - @skipIf(setting=('target.prefer-dynamic-value', 'no-dynamic-values')) + @skipIf(py_version=('>=', (3, 0))) def testSkip(self): """This setting is on by default""" self.assertTrue(False, "This test should not run!") - @skipIf(setting=('target.prefer-dynamic-value', 'run-target')) + @skipIf(py_version=('<', (3, 0))) def testNoMatch(self): self.assertTrue(True, "This test should run!") @@ -25,11 +25,11 @@ def testNotExisting(self): self.assertTrue(True, "This test should run!") - @expectedFailureAll(setting=('target.prefer-dynamic-value', 'no-dynamic-values')) + @expectedFailureAll(py_version=('>=', (3, 0))) def testXFAIL(self): self.assertTrue(False, "This test should run and fail!") - @expectedFailureAll(setting=('target.prefer-dynamic-value', 'run-target')) + @expectedFailureAll(py_version=('<', (3, 0))) def testNotXFAIL(self): self.assertTrue(True, "This test should run and succeed!")