diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-06-18 14:23:12 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-06-19 13:02:21 +0300 |
| commit | 8c3dd6d83df467f3b8e53b6c97545eabf07768be (patch) | |
| tree | 1ec635e9cea07b23f0774d2ababa5c0a4ffbce57 /extern/gtest/src/gtest_main.cc | |
| parent | 0f78a579047ec8946021ca58b8ee48f7486e6605 (diff) | |
Upgrade Google libraries
Upgrades Glog from 0.3.5 to 0.4.0, and Gtest from 0.8.0 to 0.10.0.
Hopefully this will solve compilation error on MSVC with C++17.
Diffstat (limited to 'extern/gtest/src/gtest_main.cc')
| -rw-r--r-- | extern/gtest/src/gtest_main.cc | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/extern/gtest/src/gtest_main.cc b/extern/gtest/src/gtest_main.cc index f3028225523..f6e1dd96fb3 100644 --- a/extern/gtest/src/gtest_main.cc +++ b/extern/gtest/src/gtest_main.cc @@ -27,12 +27,21 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include <stdio.h> - +#include <cstdio> #include "gtest/gtest.h" +#ifdef ARDUINO +void setup() { + testing::InitGoogleTest(); +} + +void loop() { RUN_ALL_TESTS(); } + +#else + GTEST_API_ int main(int argc, char **argv) { - printf("Running main() from gtest_main.cc\n"); + printf("Running main() from %s\n", __FILE__); testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); } +#endif |