diff options
| author | Christopher Ferris <cferris@google.com> | 2023-08-04 23:18:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-08-04 23:18:10 +0000 |
| commit | b729012837a9bd91809f66cea1938b6d8c3f9dbd (patch) | |
| tree | cd14d6ed881675e48b7f32ecedba311be13d099c | |
| parent | fd862f6a71c2fcab9e78413908f5d4b9fafff416 (diff) | |
| parent | aff7d1c005e197a2983824677e07192c9cfe020b (diff) | |
| download | gtest_extras-b729012837a9bd91809f66cea1938b6d8c3f9dbd.tar.gz | |
Add more debuggers. am: 30bc1b3b49 am: a29a89567e am: aff7d1c005
Original change: https://android-review.googlesource.com/c/platform/system/testing/gtest_extras/+/2695208
Change-Id: Ifd82d01c180cfb5fb497d63aebbb921b92544e3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | IsolateMain.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/IsolateMain.cpp b/IsolateMain.cpp index 77db51b..853d7e4 100644 --- a/IsolateMain.cpp +++ b/IsolateMain.cpp @@ -110,9 +110,17 @@ static bool RunInIsolationMode(std::vector<const char*>& args) { // just a QOL thing so it's fine if we are wrong. if ((len = TEMP_FAILURE_RETRY(readlink(exe_path.c_str(), buf, sizeof(buf) - 1))) > 0) { buf[len] = '\0'; - std::string_view file(basename(buf)); - return file != "gdb" && file != "gdbserver" && file != "gdbserver64" && - file != "gdbserver32" && file != "lldb" && file != "lldb-server"; + static std::set<std::string_view> debuggers{"gdb", + "gdbserver", + "gdbserver64", + "lldb", + "lldb-server", + "arm-lldb-server", + "arm64-lldb-server", + "riscv64-lldb-server", + "x86-lldb-server", + "x86_64-lldb-server"}; + return debuggers.find(basename(buf)) == debuggers.end(); } // If we can't figure out what our parent was just assume we are fine to isolate. } |