fix: Remove Arduino entry points #2041

ciband · 2019-01-03T18:15:29Z

Improved flexibility by removing the Arduino entry points in favor of manual calls to setup/loop that the user can call from their entry point. This is the more common use case for Arudino.

Also added the gtest/gmock_main files to the PlatformIO ignore list since we are not supporting that feature.

Improved flexibility by removing the Arduino entry points in favor of manual calls to setup/loop that the user can call from their entry point. This is the more common use case for Arudino. Also added the gtest/gmock_main files to the PlatformIO ignore list since we are not supporting that feature.

gennadiycivil

For gtest.h are there actual changes ( I only see formatting ). If not please revert

library.json

gennadiycivil

Pls take a look

ciband · 2019-01-03T18:50:02Z

There are changes in gtest.h @ line 2334. I do not know what happened with the formatting. I will correct.

I will alphabetize the file ignore list.

…ogletest into chore/fix_library_json

ciband · 2019-01-04T03:18:40Z

Still working on getting the gtest.h resolved. It is behaving like there is some auto-formatting happen during the check in. The intent is just to add the lines at the bottom. The other items should be done.

ciband · 2019-01-04T03:24:05Z

GTest updated.

ciband · 2019-01-05T01:33:54Z

@gennadiycivil
For the Arduino builds, they require setup and loop functions. In our project, we just made dummy functions for CI. Would that be acceptable here?

The other option would be to put the setup/loop functions that we took out in gtest and gmock, back in, but only for CI.

A future feature could enable these for the PlatformIO framework as an opt-in feature.

Thoughts?

gennadiycivil · 2019-01-07T03:09:03Z

CI failed

ciband · 2019-01-07T03:34:34Z

@gennadiycivil I saw that CI failed. I wasn't sure how best to proceed so I asked the question above.

Thoughts on this?

My vote would probably be to put the original entry points back but leave them disabled in the PlatformIO framework by not including the *_main.cc file.

gennadiycivil · 2019-01-07T17:15:59Z

Unfortunately I don't have an opinion because I am not familiar with the platform and its common use cases.

My take on the changes is to

Keep them isolated to Arudino guarded inside #ifdefs, etc
keep the CI green so there are no obvious breaks for the rest of the world
Some general sanity check

Added setup()/loop() functions back to *_main.cc files to support compiling in CI. Future features could enable this for the end user.

ciband · 2019-01-09T18:11:03Z

@gennadiycivil Do you need anything else on this issue.

I decided to put the functions in but only enable them for CI. If we have to have the functions, we might as well make them do the right thing and give the option for later enabling in the PlatformIO package.

gennadiycivil · 2019-01-11T21:15:15Z

googletest/include/gtest/gtest.h

+#ifdef ARDUINO
+inline void gtest_setup() {
+  // Since Arduino doesn't have a command line, fake out the argc/argv arguments
+  int argc = 1;


Let us Inot define these functions in the header. Too much noise.

Also, there is nothing interesting about this function.
If the user has to insert code to initialize GoogleTest, they might as well call testing::InitGoogleTest themselves.

At this point I think it might be simpler to provide an overload of InitGoogleTest that doesn't require argv/argc.

I like that idea better. I pushed no argument versions of the init functions and cleaned up where appropriate.

gennadiycivil

ptal

Added versions of InitGoogle[Mock|Test] that take no arguments. This is to support embedded platforms like Arduino that do not have any concept of argc/argv. Minor clang format automated changes.

gennadiycivil · 2019-01-12T21:51:07Z

googlemock/src/gmock.cc

@@ -58,8 +57,7 @@ namespace internal {
 // "=value" part can be omitted.
 //
 // Returns the value of the flag, or NULL if the parsing failed.
-static const char* ParseGoogleMockFlagValue(const char* str,
-                                            const char* flag,
+static const char* ParseGoogleMockFlagValue(const char* str, const char* flag,


Formatting seems to change without any actual changes. Could you please make sure that only actual changes are included

Yes I will fix this. I think clang-format is ran automatically on the file edit.

gennadiycivil · 2019-01-12T21:51:24Z

googlemock/src/gmock.cc

@@ -132,8 +130,8 @@ static bool ParseGoogleMockIntFlag(const char* str, const char* flag,
  if (value_str == nullptr) return false;

  // Sets *value to the value of the flag.
-  return ParseInt32(Message() << "The value of flag --" << flag,
-                    value_str, value);
+  return ParseInt32(Message() << "The value of flag --" << flag, value_str,


Same here, formatting

googletest/src/gtest_main.cc

gennadiycivil · 2019-01-14T21:54:07Z

googletest/src/gtest_main.cc

 #endif
+


... and here

googlemock/src/gmock_main.cc

gennadiycivil · 2019-01-14T21:54:39Z

googlemock/src/gmock_main.cc

}
+

still extra new line

gennadiycivil

some annoying formatting changes still

ciband · 2019-01-18T18:33:04Z

@gennadiycivil Sorry for the formatting issues. Code should be good now.

Thanks.

PiperOrigin-RevId: 230554814

gennadiycivil · 2019-01-23T18:29:34Z

This should be merged now in bf07131

ciband added 2 commits January 3, 2019 12:12

fix: Correct *_main.cc paths

0c0ca90

googlebot added the cla: yes label Jan 3, 2019

gennadiycivil reviewed Jan 3, 2019

View reviewed changes

library.json Outdated Show resolved Hide resolved

gennadiycivil reviewed Jan 3, 2019

View reviewed changes

ciband added 4 commits January 3, 2019 21:01

chore: Alphabetize exclude directories.

adc5045

chore: Add Windows cmake files to .gitignore

2353300

Merge branch 'master' into chore/fix_library_json

0ffa5f9

Merge branch 'chore/fix_library_json' of https://github.com/ciband/go…

fd1c797

…ogletest into chore/fix_library_json

ciband added 2 commits January 3, 2019 21:22

misc: Revert formatting changes.

202dcab

misc: Reapply Arduino functions

23e6937

gennadiycivil added the Conversation On-Going label Jan 7, 2019

fix: Add Arduino setup()/loop() functions back

45c58aa

Added setup()/loop() functions back to *_main.cc files to support compiling in CI. Future features could enable this for the end user.

gennadiycivil added imported-into-CL and removed Conversation On-Going labels Jan 10, 2019

gennadiycivil reviewed Jan 11, 2019

View reviewed changes

gennadiycivil suggested changes Jan 11, 2019

View reviewed changes

gennadiycivil added Conversation On-Going and removed imported-into-CL labels Jan 11, 2019

ciband added 2 commits January 12, 2019 10:13

feat: Add no argument version of init functions

c040c5d

Added versions of InitGoogle[Mock|Test] that take no arguments. This is to support embedded platforms like Arduino that do not have any concept of argc/argv. Minor clang format automated changes.

fix: Correct typo

7a8443c

gennadiycivil reviewed Jan 12, 2019

View reviewed changes

ciband added 2 commits January 13, 2019 14:38

misc: Revert formatting changes

4d42e18

misc: Remove trailing whitespace

52525e5

gennadiycivil reviewed Jan 14, 2019

View reviewed changes

googletest/src/gtest_main.cc Outdated Show resolved Hide resolved

gennadiycivil reviewed Jan 14, 2019

View reviewed changes

googlemock/src/gmock_main.cc Outdated Show resolved Hide resolved

gennadiycivil reviewed Jan 14, 2019

View reviewed changes

ciband added 3 commits January 14, 2019 15:57

misc: Remove extra whitespace

a819e3e

misc: Remove extra whitespace

db79cb6

misc: Remove extra whitespace

a20ca71

gennadiycivil approved these changes Jan 23, 2019

View reviewed changes

gennadiycivil added imported-into-CL and removed Conversation On-Going labels Jan 23, 2019

gennadiycivil added a commit that referenced this pull request Jan 23, 2019

Merge pull request #2041 from ciband:chore/fix_library_json

bf07131

PiperOrigin-RevId: 230554814

gennadiycivil closed this Jan 23, 2019

ciband mentioned this pull request Feb 1, 2019

Feat: Add GTest/GMock support for ESP32 ArkEcosystemArchive/cpp-client#66

Merged

6 tasks

fix: Remove Arduino entry points #2041

fix: Remove Arduino entry points #2041

Uh oh!

Conversation

ciband commented Jan 3, 2019

Uh oh!

gennadiycivil left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

gennadiycivil left a comment

Choose a reason for hiding this comment

Uh oh!

ciband commented Jan 3, 2019

Uh oh!

ciband commented Jan 4, 2019

Uh oh!

ciband commented Jan 4, 2019

Uh oh!

ciband commented Jan 5, 2019

Uh oh!

gennadiycivil commented Jan 7, 2019

Uh oh!

ciband commented Jan 7, 2019

Uh oh!

gennadiycivil commented Jan 7, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ciband commented Jan 9, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gennadiycivil left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gennadiycivil left a comment

Choose a reason for hiding this comment

Uh oh!

ciband commented Jan 18, 2019

Uh oh!

gennadiycivil commented Jan 23, 2019

Uh oh!

Uh oh!

gennadiycivil commented Jan 7, 2019 •

edited

Loading