Skip to content

Commit bf6880c

Browse files
authored
[lldb] Don't emit .lldbinit warning as an error (#163265)
Actually emit a warning, rather than an error, when there's an .lldbinit file in the current directly. Currently, the message is prepended by "error" which looks rather odd, as the warning refers to itself as a warning.
1 parent e9b935e commit bf6880c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

lldb/source/Interpreter/CommandInterpreter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2591,7 +2591,7 @@ void CommandInterpreter::SourceInitFileCwd(CommandReturnObject &result) {
25912591
llvm::sys::path::parent_path(home_init_file.GetPath())) {
25922592
result.SetStatus(eReturnStatusSuccessFinishNoResult);
25932593
} else {
2594-
result.AppendError(InitFileWarning);
2594+
result.AppendWarning(InitFileWarning);
25952595
}
25962596
}
25972597
}

lldb/test/Shell/Driver/LocalLLDBInit.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# RUN: env HOME=%t.home %lldb-init -local-lldbinit -o 'settings show frame-format' 2>&1 | FileCheck %s --check-prefix=ALLOWINIT --check-prefix=NOINIT
1010
# RUN: %lldb -o 'settings show frame-format' 2>&1 | FileCheck %s --check-prefix=NOINIT --check-prefix=CHECK
1111

12-
# WARNINIT: There is a .lldbinit file in the current directory which is not being read.
12+
# WARNINIT: warning: There is a .lldbinit file in the current directory which is not being read.
1313
# NOINIT-NOT: There is a .lldbinit file in the current directory which is not being read.
1414
# CHECK-NOT: bogus
1515
# ALLOWINIT: name 'prlnt' is not defined

0 commit comments

Comments
 (0)