Commit 2a2620e
deps: update googletest to 34ad51b
PR-URL: #53157
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Ulises Gascón <ulisesgascongonzalez@gmail.com>
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Michael Dawson <midawson@redhat.com>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent c01ce60 commit 2a2620e
1 file changed
Lines changed: 5 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -661,11 +661,14 @@ ::std::vector<std::string> GetArgvs() { | |||
| 661 | 661 | FilePath GetCurrentExecutableName() { | |
| 662 | 662 | FilePath result; | |
| 663 | 663 | ||
| 664 | + auto args = GetArgvs(); | ||
| 665 | + if (!args.empty()) { | ||
| 664 | 666 | #if defined(GTEST_OS_WINDOWS) || defined(GTEST_OS_OS2) | |
| 665 | - result.Set(FilePath(GetArgvs()[0]).RemoveExtension("exe")); | ||
| 667 | + result.Set(FilePath(args[0]).RemoveExtension("exe")); | ||
| 666 | 668 | #else | |
| 667 | - result.Set(FilePath(GetArgvs()[0])); | ||
| 669 | + result.Set(FilePath(args[0])); | ||
| 668 | 670 | #endif // GTEST_OS_WINDOWS | |
| 671 | + } | ||
| 669 | 672 | ||
| 670 | 673 | return result.RemoveDirectoryName(); | |
| 671 | 674 | } | |
0 commit comments