diff options
| author | Med Ismail Bennani <medismail.bennani@gmail.com> | 2022-02-25 16:31:46 -0800 |
|---|---|---|
| committer | Med Ismail Bennani <medismail.bennani@gmail.com> | 2022-02-25 17:20:35 -0800 |
| commit | badb6e2730a970b5ee94f0adb77c2de741ebbf68 (patch) | |
| tree | 0c1170ceb0f5efde333301529eca3a55d292bd6d /lldb/test/Shell/ScriptInterpreter/Python/Crashlog | |
| parent | cb1654ee4beedc875c25a95e7b98f1aaed0b9e35 (diff) | |
| download | llvm-badb6e2730a970b5ee94f0adb77c2de741ebbf68.zip llvm-badb6e2730a970b5ee94f0adb77c2de741ebbf68.tar.gz llvm-badb6e2730a970b5ee94f0adb77c2de741ebbf68.tar.bz2 | |
[lldb/crashlog] Fix scripted_crashlog_json.test failure
This patch should fix the test failure on scripted_crashlog_json.test.
The failure is happening because crash reporter will obfuscate the
executable path in the crashlog, if it is located inside the user's
home directory and replace it with `/USER/*/` as a placeholder.
To fix that, we can patch the placeholder with the executable path
before loading the crashlog in lldb.
This also fixes a bug where we would create another target when loading
the crashlog in a scripted process, even if lldb already had a target
for it. Now, crashlog will only create a target if there is none in lldb.
Differential Revision: https://reviews.llvm.org/D120598
Signed-off-by: Med Ismail Bennani <medismail.bennani@gmail.com>
Diffstat (limited to 'lldb/test/Shell/ScriptInterpreter/Python/Crashlog')
| -rw-r--r-- | lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/a.out.ips | 4 | ||||
| -rw-r--r-- | lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/scripted_crashlog.ips | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/a.out.ips b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/a.out.ips index af72bba..cc2f16c 100644 --- a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/a.out.ips +++ b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/a.out.ips @@ -21,8 +21,8 @@ "incident" : "FA21DF23-3344-4E45-BF27-4B8E63B7012B", "pid" : 72932, "cpuType" : "X86-64", - "procName" : "json.test.tmp.out", - "procPath" : "\/Users\/USER\/*\/json.test.tmp.out", + "procName" : "@NAME@", + "procPath" : "@EXEC@", "parentProc" : "fish", "parentPid" : 67002, "coalitionName" : "io.alacritty", diff --git a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/scripted_crashlog.ips b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/scripted_crashlog.ips index 02dbbb5..5abbc80 100644 --- a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/scripted_crashlog.ips +++ b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/scripted_crashlog.ips @@ -21,8 +21,8 @@ "procExitAbsTime" : 6478056175721, "translated" : false, "cpuType" : "ARM-64", - "procName" : "scripted_crashlog_json.test.tmp.out", - "procPath" : "\/Users\/USER\/*\/scripted_crashlog_json.test.tmp.out", + "procName" : "@NAME@", + "procPath" : "@EXEC@", "parentProc" : "zsh", "parentPid" : 82132, "coalitionName" : "com.apple.Terminal", @@ -47,8 +47,9 @@ "base" : 4372692992, "size" : 16384, "uuid" : "b928ee77-9429-334f-ac88-41440bb3d4c7", - "path" : "\/Users\/USER\/*\/scripted_crashlog_json.test.tmp.out", - "name" : "scripted_crashlog_json.test.tmp.out" + "uuid" : "@UUID@", + "path" : "@EXEC@", + "name" : "@NAME@" }, { "source" : "P", |