Fix TestDataFormatterScript for Linux.

chaoren · chaoren · commit 3b2bec41fd55 · 2016-01-29T03:48:08.000Z
Summary: m_function_name will contain a dummy name for the auto-generated function from the python script on Linux. Check for script name first. Reviewers: granata.enrico Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D16703 llvm-svn: 259153
diff --git a/lldb/source/DataFormatters/TypeSummary.cpp b/lldb/source/DataFormatters/TypeSummary.cpp
@@ -263,21 +263,20 @@ ScriptSummaryFormat::GetDescription ()
                  SkipsPointers() ? " (skip pointers)" : "",
                  SkipsReferences() ? " (skip references)" : "",
                  HideNames(nullptr) ? " (hide member names)" : "");
-    if (m_function_name.empty())
+    if (m_python_script.empty())
     {
-        if (m_python_script.empty())
+        if (m_function_name.empty())
         {
             sstr.PutCString("no backing script");
         }
         else
         {
-            sstr.PutCString(m_python_script.c_str());
+            sstr.PutCString(m_function_name.c_str());
         }
     }
     else
     {
-        sstr.PutCString(m_function_name.c_str());
+        sstr.PutCString(m_python_script.c_str());
     }
     return sstr.GetString();
-    
 }

Original file line number	Diff line number	Diff line change
`@@ -263,21 +263,20 @@ ScriptSummaryFormat::GetDescription ()`
`263`	`263`	`SkipsPointers() ? " (skip pointers)" : "",`
`264`	`264`	`SkipsReferences() ? " (skip references)" : "",`
`265`	`265`	`HideNames(nullptr) ? " (hide member names)" : "");`
`266`		`- if (m_function_name.empty())`
	`266`	`+ if (m_python_script.empty())`
`267`	`267`	`{`
`268`		`- if (m_python_script.empty())`
	`268`	`+ if (m_function_name.empty())`
`269`	`269`	`{`
`270`	`270`	`sstr.PutCString("no backing script");`
`271`	`271`	`}`
`272`	`272`	`else`
`273`	`273`	`{`
`274`		`- sstr.PutCString(m_python_script.c_str());`
	`274`	`+ sstr.PutCString(m_function_name.c_str());`
`275`	`275`	`}`
`276`	`276`	`}`
`277`	`277`	`else`
`278`	`278`	`{`
`279`		`- sstr.PutCString(m_function_name.c_str());`
	`279`	`+ sstr.PutCString(m_python_script.c_str());`
`280`	`280`	`}`
`281`	`281`	`return sstr.GetString();`
`282`		`-`
`283`	`282`	`}`