[Lldb-commits] [lldb] r249821 - Fix regression caused by r249769

[Tamas Berghammer via lldb-commits]

Author: tberghammer
Date: Fri Oct  9 06:01:56 2015
New Revision: 249821

URL: http://llvm.org/viewvc/llvm-project?rev=249821&view=rev
Log:
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

Modified:
    lldb/trunk/source/Core/PluginManager.cpp
    lldb/trunk/test/settings/TestSettings.py

Modified: lldb/trunk/source/Core/PluginManager.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/PluginManager.cpp?rev=249821&r1=249820&r2=249821&view=diff
==============================================================================
--- lldb/trunk/source/Core/PluginManager.cpp (original)
+++ lldb/trunk/source/Core/PluginManager.cpp Fri Oct  9 06:01:56 2015
@@ -2564,6 +2564,7 @@ PluginManager::RegisterPlugin (const Con
         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);
     }

Modified: lldb/trunk/test/settings/TestSettings.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/settings/TestSettings.py?rev=249821&r1=249820&r2=249821&view=diff
==============================================================================
--- lldb/trunk/test/settings/TestSettings.py (original)
+++ lldb/trunk/test/settings/TestSettings.py Fri Oct  9 06:01:56 2015
@@ -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