Index: lldb/trunk/source/Utility/ProcessInfo.cpp =================================================================== --- lldb/trunk/source/Utility/ProcessInfo.cpp +++ lldb/trunk/source/Utility/ProcessInfo.cpp @@ -169,13 +169,15 @@ if (verbose) { s.Printf("PID PARENT USER GROUP EFF USER EFF GROUP TRIPLE " - " %s\n", + " %s\n", label); - s.PutCString("====== ====== ========== ========== ========== ========== " - "======================== ============================\n"); + s.PutCString( + "====== ====== ========== ========== ========== ========== " + "============================== ============================\n"); } else { - s.Printf("PID PARENT USER TRIPLE %s\n", label); - s.PutCString("====== ====== ========== ======================== " + s.Printf("PID PARENT USER TRIPLE %s\n", + label); + s.PutCString("====== ====== ========== ============================== " "============================\n"); } } @@ -216,12 +218,12 @@ &ProcessInstanceInfo::GetEffectiveGroupID, &UserIDResolver::GetGroupName); - s.Printf("%-24s ", arch_strm.GetData()); + s.Printf("%-30s ", arch_strm.GetData()); } else { print(&ProcessInstanceInfo::EffectiveUserIDIsValid, &ProcessInstanceInfo::GetEffectiveUserID, &UserIDResolver::GetUserName); - s.Printf("%-24s ", arch_strm.GetData()); + s.Printf("%-30s ", arch_strm.GetData()); } if (verbose || show_args) { Index: lldb/trunk/unittests/Utility/ProcessInstanceInfoTest.cpp =================================================================== --- lldb/trunk/unittests/Utility/ProcessInstanceInfoTest.cpp +++ lldb/trunk/unittests/Utility/ProcessInstanceInfoTest.cpp @@ -67,15 +67,15 @@ ProcessInstanceInfo::DumpTableHeader(s, show_args, verbose); info.DumpAsTableRow(s, resolver, show_args, verbose); EXPECT_STREQ( - R"(PID PARENT USER GROUP EFF USER EFF GROUP TRIPLE ARGUMENTS -====== ====== ========== ========== ========== ========== ======================== ============================ -47 0 user1 group3 2 4 x86_64-pc-linux + R"(PID PARENT USER GROUP EFF USER EFF GROUP TRIPLE ARGUMENTS +====== ====== ========== ========== ========== ========== ============================== ============================ +47 0 user1 group3 2 4 x86_64-pc-linux )", s.GetData()); } TEST(ProcessInstanceInfo, DumpTable_invalidUID) { - ProcessInstanceInfo info("a.out", ArchSpec("x86_64-pc-linux"), 47); + ProcessInstanceInfo info("a.out", ArchSpec("aarch64-unknown-linux-android"), 47); DummyUserIDResolver resolver; StreamString s; @@ -85,9 +85,9 @@ ProcessInstanceInfo::DumpTableHeader(s, show_args, verbose); info.DumpAsTableRow(s, resolver, show_args, verbose); EXPECT_STREQ( - R"(PID PARENT USER TRIPLE NAME -====== ====== ========== ======================== ============================ -47 0 x86_64-pc-linux a.out + R"(PID PARENT USER TRIPLE NAME +====== ====== ========== ============================== ============================ +47 0 aarch64-unknown-linux-android a.out )", s.GetData()); }