Merge pull request #2041 from ciband:chore/fix_library_json
PiperOrigin-RevId: 230554814
This commit is contained in:
		@@ -198,4 +198,16 @@ GTEST_API_ void InitGoogleMock(int* argc, wchar_t** argv) {
 | 
			
		||||
  internal::InitGoogleMockImpl(argc, argv);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// This overloaded version can be used on Arduino/embedded platforms where
 | 
			
		||||
// there is no argc/argv.
 | 
			
		||||
GTEST_API_ void InitGoogleMock() {
 | 
			
		||||
  // Since Arduino doesn't have a command line, fake out the argc/argv arguments
 | 
			
		||||
  int argc = 1;
 | 
			
		||||
  const auto arg0 = "dummy";
 | 
			
		||||
  char* argv0 = const_cast<char*>(arg0);
 | 
			
		||||
  char** argv = &argv0;
 | 
			
		||||
 | 
			
		||||
  internal::InitGoogleMockImpl(&argc, argv);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
}  // namespace testing
 | 
			
		||||
 
 | 
			
		||||
@@ -34,16 +34,10 @@
 | 
			
		||||
 | 
			
		||||
#ifdef ARDUINO
 | 
			
		||||
void setup() {
 | 
			
		||||
  // Since Arduino doesn't have a command line, fake out the argc/argv arguments
 | 
			
		||||
  int argc = 1;
 | 
			
		||||
  const auto arg0 = "PlatformIO";
 | 
			
		||||
  char* argv0 = const_cast<char*>(arg0);
 | 
			
		||||
  char** argv = &argv0;
 | 
			
		||||
 | 
			
		||||
  // Since Google Mock depends on Google Test, InitGoogleMock() is
 | 
			
		||||
  // also responsible for initializing Google Test.  Therefore there's
 | 
			
		||||
  // no need for calling testing::InitGoogleTest() separately.
 | 
			
		||||
  testing::InitGoogleMock(&argc, argv);
 | 
			
		||||
  testing::InitGoogleMock();
 | 
			
		||||
}
 | 
			
		||||
void loop() { RUN_ALL_TESTS(); }
 | 
			
		||||
#else
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user