Merge commit 'fa4bf3a11a42' from llvm.org/main into next

Author: git apple-llvm automerger

lldb/test/API/commands/settings/TestSettings.py

@@ -1022,7 +1022,7 @@ def test_settings_api(self):
         path2 = os.path.join(self.getSourceDir(), "tmp2")
         self.runCmd("settings set %s '%s' '%s'" % (setting_path, path1, path2))
         settings_json = self.get_setting_json(setting_path)
-        self.assertEqual(settings_json, setting_value)
+        self.assertEqual(settings_json, [path1, path2])
 
         # Test OptionValueFormatEntity
         setting_value = """thread #${thread.index}{, name = \\'${thread.name}\\