From 3b2bec41fd5522b31f08baa2db419055b802de58 Mon Sep 17 00:00:00 2001 From: Chaoren Lin Date: Fri, 29 Jan 2016 03:48:08 +0000 Subject: [PATCH] Fix TestDataFormatterScript for Linux. 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 --- lldb/source/DataFormatters/TypeSummary.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lldb/source/DataFormatters/TypeSummary.cpp b/lldb/source/DataFormatters/TypeSummary.cpp index 1ef9ea6..dd4cd97 100644 --- 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(); - } -- 2.7.4