mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-27 23:02:20 +00:00
Bug 1906722 - Update googletest to 34ad51b3dc4f922d8ab622491dd44fc2c39afee9 r=gbrown
Differential Revision: https://phabricator.services.mozilla.com/D217861
This commit is contained in:
parent
d3745bcee5
commit
fa57771a3c
@ -73,8 +73,6 @@
|
||||
#include "gtest/internal/gtest-internal.h"
|
||||
#include "gtest/internal/gtest-string.h"
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
|
||||
GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
|
||||
/* class A needs to have dll-interface to be used by clients of class B */)
|
||||
|
||||
@ -327,7 +325,7 @@ class GTEST_API_ Test {
|
||||
//
|
||||
// DO NOT OVERRIDE THIS FUNCTION DIRECTLY IN A USER PROGRAM.
|
||||
// Instead, use the TEST or TEST_F macro.
|
||||
MOZ_CAN_RUN_SCRIPT virtual void TestBody() = 0;
|
||||
virtual void TestBody() = 0;
|
||||
|
||||
// Sets up, executes, and tears down the test.
|
||||
void Run();
|
||||
|
@ -661,11 +661,14 @@ static ::std::vector<std::string> g_argvs;
|
||||
FilePath GetCurrentExecutableName() {
|
||||
FilePath result;
|
||||
|
||||
auto args = GetArgvs();
|
||||
if (!args.empty()) {
|
||||
#if defined(GTEST_OS_WINDOWS) || defined(GTEST_OS_OS2)
|
||||
result.Set(FilePath(GetArgvs()[0]).RemoveExtension("exe"));
|
||||
result.Set(FilePath(args[0]).RemoveExtension("exe"));
|
||||
#else
|
||||
result.Set(FilePath(GetArgvs()[0]));
|
||||
result.Set(FilePath(args[0]));
|
||||
#endif // GTEST_OS_WINDOWS
|
||||
}
|
||||
|
||||
return result.RemoveDirectoryName();
|
||||
}
|
||||
|
4
third_party/googletest/moz.yaml
vendored
4
third_party/googletest/moz.yaml
vendored
@ -10,9 +10,9 @@ origin:
|
||||
|
||||
url: https://google.github.io/googletest/
|
||||
|
||||
release: 9b4993ca7d1279dec5c5d41ba327cb11a77bdc00 (2024-05-21T19:08:38Z).
|
||||
release: 34ad51b3dc4f922d8ab622491dd44fc2c39afee9 (2024-06-28T18:12:56Z).
|
||||
|
||||
revision: 9b4993ca7d1279dec5c5d41ba327cb11a77bdc00
|
||||
revision: 34ad51b3dc4f922d8ab622491dd44fc2c39afee9
|
||||
|
||||
license: BSD-3-Clause
|
||||
license-file: LICENSE
|
||||
|
Loading…
Reference in New Issue
Block a user