diff options
| author | Tamas Berghammer <tberghammer@google.com> | 2015-10-09 11:01:56 +0000 |
|---|---|---|
| committer | Tamas Berghammer <tberghammer@google.com> | 2015-10-09 11:01:56 +0000 |
| commit | 62a1514ca70dfcea28c413ff55c214eb49f0a4d4 (patch) | |
| tree | f68d30c41b53a0c96e3eb2257f08a9ea992883cb | |
| parent | 99493df257a69faaf1eab1c9b1bbc204f1a2f557 (diff) | |
| download | bcm5719-llvm-62a1514ca70dfcea28c413ff55c214eb49f0a4d4.tar.gz bcm5719-llvm-62a1514ca70dfcea28c413ff55c214eb49f0a4d4.zip | |
Fix regression caused by r249769
* Change TestSettings to test qith go instead of pascal as ToT pascal
support isn't complete
* Fix crash inside PluginManager
llvm-svn: 249821
| -rw-r--r-- | lldb/source/Core/PluginManager.cpp | 1 | ||||
| -rw-r--r-- | lldb/test/settings/TestSettings.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lldb/source/Core/PluginManager.cpp b/lldb/source/Core/PluginManager.cpp index 4b320744db6..b47a982f189 100644 --- a/lldb/source/Core/PluginManager.cpp +++ b/lldb/source/Core/PluginManager.cpp @@ -2564,6 +2564,7 @@ PluginManager::RegisterPlugin (const ConstString &name, if (description && description[0]) instance.description = description; instance.create_callback = create_callback; + instance.enumerate_callback = enumerate_supported_languages_callback; Mutex::Locker locker (GetTypeSystemMutex ()); GetTypeSystemInstances ().push_back (instance); } diff --git a/lldb/test/settings/TestSettings.py b/lldb/test/settings/TestSettings.py index f430a9dae3d..21b8b76ebf7 100644 --- a/lldb/test/settings/TestSettings.py +++ b/lldb/test/settings/TestSettings.py @@ -405,9 +405,9 @@ class SettingsCommandTestCase(TestBase): self.runCmd("settings clear stop-disassembly-display", check=False) # language self.runCmd ("settings set target.language c89") # Set to known value - self.runCmd ("settings set target.language pascal ") # Set to new value with trailing whitespace + self.runCmd ("settings set target.language go ") # Set to new value with trailing whitespace self.expect ("settings show target.language", SETTING_MSG("target.language"), - startstr = "target.language (language) = pascal") + startstr = "target.language (language) = go") self.runCmd("settings clear target.language", check=False) # arguments self.runCmd ("settings set target.run-args 1 2 3") # Set to known value |
