Commit Graph

3524 Commits

Author SHA1 Message Date
Laurent VERDOÏA
e3c25c1699 Fix --gtest_print_time coloring 2020-03-29 14:58:47 +02:00
Arthur O'Dwyer
6ed4e7168f Replace the last instance of throw() with noexcept. NFC.
Fixes a -Wdeprecated warning.

/home/travis/build/Quuxplusone/googletest/googletest/test/googletest-death-test_ex_test.cc:62:28: error:
      dynamic exception specifications are deprecated [-Werror,-Wdeprecated]
  const char* what() const throw() override { return "exceptional message"; }
                           ^~~~~~~
/home/travis/build/Quuxplusone/googletest/googletest/test/googletest-death-test_ex_test.cc:62:28: note:
      use 'noexcept' instead
  const char* what() const throw() override { return "exceptional message"; }
                           ^~~~~~~
                           noexcept
2020-03-28 15:15:20 -04:00
Arthur O'Dwyer
5504ded3ab Fix a typo in .travis.yml
The old code was trying to pass -Wgnu-zero-variadic-macro-arguments
as part of CXXFLAGS, but it forgot the quotation marks needed around
whitespace. This meant that option was ignored:
https://travis-ci.org/github/google/googletest/jobs/666534177#L760

Unfortunately, the codebase is not remotely clean with respect to that
warning option. It fails like this:
https://travis-ci.org/github/Quuxplusone/googletest/jobs/668118135

So, remove that failing configuration from the test matrix until
someone has time to look at it.
2020-03-28 13:06:55 -04:00
vslashg
189299e957
Merge branch 'master' into quiet-flag 2020-03-27 15:36:58 -04:00
Mario Voorsluys
c447b2166b Fixed xml unit-tests and added extra tests
The extra tests check that the xml output is correct when a failure occurs before skipping, and that the right skip message is added to the file.

The json file had to be fixed because it's the same executable.
2020-03-26 19:17:20 +01:00
Mario Voorsluys
23dadb8472 Fix multiple \n characters in xml file when using GTEST_SKIP. 2020-03-26 19:14:32 +01:00
Mario Voorsluys
d28d05cc64 Only write ">\n" once when there is failure and skipped tests. 2020-03-26 15:03:32 +01:00
Mario Voorsluys
59e5b401a5 Output skipped information in the xml file. 2020-03-26 13:56:05 +01:00
Xiaoyi Zhang
67cc66080d Merge pull request #2350 from adambadura:MockFunctionFromStdFunction
PiperOrigin-RevId: 302677275
2020-03-24 17:32:16 -04:00
Abseil Team
1ced315a48 Googletest export
Add --gtest_fail_fast support to googletest.

  - Analogous functionality to to golang -test.failfast and python --failfast
  - Stops test execution upon first test failure.
  - Also add support Bazel equivalent env var (TESTBRIDGE_TEST_RUNNER_FAIL_FAST)

PiperOrigin-RevId: 302488880
2020-03-24 17:32:07 -04:00
Krystian Kuzniarek
acabdf65fb remove chapters on Autotools, Meson and plain Makefiles 2020-03-24 15:37:34 +01:00
Krystian Kuzniarek
82e5767f78 remove dead code in googletest-output-test 2020-03-24 15:18:30 +01:00
Przemek Kryger
08347d7a16 Swap settimer and sigaction calls to avoid SIGPROF
Fixes #2760.
2020-03-24 10:08:42 +00:00
Neal Gompa
3549237957 Ensure that gtest/gmock pkgconfig requirements specify version
Google Test and Google Mock require matching versions to work,
so this requirement should be described in the pkgconfig files.

This change is derived from the one used for the Fedora gtest package.

Signed-off-by: Neal Gompa <ngompa13@gmail.com>
2020-03-21 06:38:09 -04:00
Neal Gompa
94a7cf8c57 Set the version for the libraries
When building packaged shared libraries for use, having the version
set makes it so that the soname is set correctly for parallel installation.

This change is derived from the one used for the Fedora gtest package.

Signed-off-by: Neal Gompa <ngompa13@gmail.com>
2020-03-21 05:50:10 -04:00
Abseil Team
749148f1ac Googletest export
Internal change

PiperOrigin-RevId: 302048013
2020-03-20 20:15:32 -04:00
vslashg
dbe804f986 Merge pull request #2746 from Romain-Geissler-1A:master
PiperOrigin-RevId: 302045808
2020-03-20 20:15:24 -04:00
Calum Robinson
fb19f57880 Add GTEST_BRIEF option
Only prints failures and a total pass count
2020-03-19 20:33:58 +00:00
Adam Badura
53740ebc21 Add support for std::function in MockFunction (#2277) 2020-03-18 01:11:30 +01:00
Adam Badura
e41f31f2af Add tests for MockFunction deduction (#2277)
Add tests checking that ::testing::MockFunction template argument can
be deduced in a function call context. This is a property raised in the
review, however, not checked before by any tests.
2020-03-18 01:11:30 +01:00
Abseil Team
482ac6ee63 Googletest export
Move internal function out of header because Hyrum's law always wins.

PiperOrigin-RevId: 301446904
2020-03-17 17:20:47 -04:00
dmauro
c43f7100f0 Googletest export
Use a polymorphic matcher instead of the GreaterThan<int> test matcher
to fix the sign-comparison warning on MSVC.

PiperOrigin-RevId: 301163657
2020-03-17 17:20:39 -04:00
Abseil Team
227faf41db Googletest export
Fix Compilation against CMake < 3.7 (Fix #2711)

`VERSION_GREATER_EQUAL` was introduced in CMake 3.7
ref: https://cmake.org/cmake/help/v3.7/release/3.7.html#commands
PiperOrigin-RevId: 300817917
2020-03-17 17:20:31 -04:00
Abseil Team
230afdb24e Googletest export
Internal change

PiperOrigin-RevId: 299345492
2020-03-17 17:20:23 -04:00
Abseil Team
0bf8ea3065 Googletest export
Simplify the fallback printing logic to have a single sequence of trial printers.

PiperOrigin-RevId: 298621376
2020-03-17 17:20:15 -04:00
vslashg
3de76551e0 Merge pull request #2722 from JohanMabille:warnings
PiperOrigin-RevId: 298608772
2020-03-17 17:20:07 -04:00
vslashg
878bd92e0f Merge pull request #2716 from kuzkry:autotools-leftover
PiperOrigin-RevId: 298599235
2020-03-17 17:19:59 -04:00
Abseil Team
cfb5ef4e7d Googletest export
Remove public buganizer reference from googletest cookbook.

It also seems that this bug is obsolete.

PiperOrigin-RevId: 298598298
2020-03-17 17:19:51 -04:00
Romain Geissler
a1b0173df9 Make sure IsATTY does not clobber errno.
Exposition of the problem:
> cat main.cpp

TEST(errnoTest, errnoTest)
{
    ASSERT_EQ(errno, 0);
}

int main(int argc, char** argv)
{
    ::testing::InitGoogleTest(&argc, argv);

    return RUN_ALL_TESTS();
}

Compiled with gcc 10 like this:
> g++ -pthread -o runtest main.cpp -Wl,-Bstatic -lgtest -Wl,-Bdynamic

Before patch:
>  ./runtest
[==========] Running 1 test from 1 test suite.
[----------] Global test environment set-up.
[----------] 1 test from errnoTest
[ RUN      ] errnoTest.errnoTest
[       OK ] errnoTest.errnoTest (0 ms)
[----------] 1 test from errnoTest (0 ms total)

[----------] Global test environment tear-down
[==========] 1 test from 1 test suite ran. (0 ms total)
[  PASSED  ] 1 test.

(output is colored, I run this inside an interactive terminal).

> ./runtest | cat
[==========] Running 1 test from 1 test suite.
[----------] Global test environment set-up.
[----------] 1 test from errnoTest
[ RUN      ] errnoTest.errnoTest
main.cpp:5: Failure
Expected equality of these values:
  (*__errno_location ())
    Which is: 25
  0
[  FAILED  ] errnoTest.errnoTest (0 ms)
[----------] 1 test from errnoTest (0 ms total)

[----------] Global test environment tear-down
[==========] 1 test from 1 test suite ran. (0 ms total)
[  PASSED  ] 0 tests.
[  FAILED  ] 1 test, listed below:
[  FAILED  ] errnoTest.errnoTest

 1 FAILED TEST

(output is not colored, since IsTTY return false, because of the pipe,
however it also clobbered errno for the tests).

After the patch, both cases are working fine:
> ./runtest
[==========] Running 1 test from 1 test suite.
[----------] Global test environment set-up.
[----------] 1 test from errnoTest
[ RUN      ] errnoTest.errnoTest
[       OK ] errnoTest.errnoTest (0 ms)
[----------] 1 test from errnoTest (0 ms total)

[----------] Global test environment tear-down
[==========] 1 test from 1 test suite ran. (0 ms total)
[  PASSED  ] 1 test.

> ./runtest | cat
[==========] Running 1 test from 1 test suite.
[----------] Global test environment set-up.
[----------] 1 test from errnoTest
[ RUN      ] errnoTest.errnoTest
[       OK ] errnoTest.errnoTest (0 ms)
[----------] 1 test from errnoTest (0 ms total)

[----------] Global test environment tear-down
[==========] 1 test from 1 test suite ran. (0 ms total)
[  PASSED  ] 1 test.
2020-03-11 22:39:20 +00:00
Abseil Team
e588eb1ff9 Googletest export
Rename internal color enumerators to avoid conflicts with curses.h macro definitions.
Fixes #2685

PiperOrigin-RevId: 297639382
2020-02-28 16:41:09 -05:00
Abseil Team
909b1ccfca Googletest export
Relax the implementation of MatcherCast to allow conversion of `Matcher<T>` to
`Matcher<const T&>`. They have the same match signature.

PiperOrigin-RevId: 297115843
2020-02-28 16:41:01 -05:00
Abseil Team
fd538161f4 Googletest export
Allow construction of an Action from a callable of zero args

Action already allows construction from a callable with the same args as the mocked function, without needing to wrap the callable in Invoke. However, if you don't care about the arguments to the mocked function you need to either accept all of them or wrap your callable in InvokeWithoutArgs. This change makes both of those unnecessary, since it allows you to pass a no-args callable to Action directly.

PiperOrigin-RevId: 296117034
2020-02-28 16:40:53 -05:00
NINI1988
ff4872659a Add missing call for gtest_list_output_unittest_ unitTest.
Add unitTest for fixed TEST_P line number.
Use CodeLocation TestInfo struct.
2020-02-21 17:51:29 +01:00
Johan Mabille
04e52ebe78 Fixed warnings 2020-02-21 11:55:07 +01:00
NINI1988
25385c23e9 Fix: shadow member 2020-02-18 22:55:20 +01:00
NINI1988
921972cba3 Add correct line number to TEST_P test cases for gtest_output. 2020-02-18 22:23:44 +01:00
Mark Jan van Kampen
937b3ce9f7
Merge branch 'master' of https://github.com/google/googletest into cmake-QNX-fix
# Conflicts:
#	CMakeLists.txt
2020-02-17 09:41:49 +01:00
Abseil Team
23b2a3b1cf Googletest export
Remove the CMAKE_CXX_STANDARD from GoogleTest's CMakeLists.txt

This causes ABI issues since it can create a mixed-mode build.  The
value should be inherited from the top-level build if it needs to be
set.

PiperOrigin-RevId: 294730724
2020-02-13 13:52:14 -05:00
Abseil Team
6f5fd0d719 Googletest export
Add gmock Matcher<std::string_view> specialization.

PiperOrigin-RevId: 294443240
2020-02-11 15:50:26 -05:00
Abseil Team
d0930731d6 Googletest export
Fix gmock_gen to use MOCK_METHOD instead of old style macros.  Fix several
related bugs in argument parsing and return types.
- handle commas more correctly in return types
- handle commas correctly in arguments
- handle default values more correctly

PiperOrigin-RevId: 294435093
2020-02-11 15:50:18 -05:00
Abseil Team
56de7cc8b5 Googletest export
Fix gmock_gen to use MOCK_METHOD instead of old style macros.

PiperOrigin-RevId: 294360947
2020-02-11 15:50:10 -05:00
Abseil Team
360f5f70a3 Googletest export
Fix gmock_gen to use MOCK_METHOD instead of old style macros.

PiperOrigin-RevId: 294332975
2020-02-11 15:50:01 -05:00
Abseil Team
139fa202c9 Googletest export
Refactor function GetNextPrime so that the loop precondition is checked before
loop instead of during every loop run.  Also by removing the loop condition,
it shows that the only exit from the loop is the return statement.

PiperOrigin-RevId: 293932783
2020-02-11 15:49:53 -05:00
Abseil Team
41b5f149ab Googletest export
Get rid of gmock-generated-matchers.h and gmock-generated-matchers.h.pump.

Stop using pump for MATCHER* macroses generation.

PiperOrigin-RevId: 293878808
2020-02-07 18:20:45 -05:00
durandal
2d6d7a01c9 Googletest export
Tag the function generated by MATCHER with GTEST_ATTRIBUTE_UNUSED_ to fix CI builds of gmock-matchers_test.cc vs. -Wunused-function.

See https://github.com/google/googletest/pull/2697 for breakage.

PiperOrigin-RevId: 293669752
2020-02-07 13:35:36 -05:00
Abseil Team
fbf67a70d0 Googletest export
Get rid of gmock-generated-function-mockers.h and
gmock-generated-function-mockers.h.pump.

Stop using pump for GMOCK_METHOD* macroses generation.

PiperOrigin-RevId: 293454519
2020-02-07 13:35:27 -05:00
Abseil Team
11d9834e98 Googletest export
...text exposed to GitHub repo https://www.github.com/google/googletest

PiperOrigin-RevId: 293438092
2020-02-07 13:35:19 -05:00
Abseil Team
d02e277275 Googletest export
Pass method's parameters count to internal GMOCK_METHOD* macro.

This will help removing copypaste in every GMOCK_METHOD* macro in future.

PiperOrigin-RevId: 292932554
2020-02-07 13:35:10 -05:00
Abseil Team
4f6609129a Googletest export
Fix std::move to std::forward where appropriate to support reference types.

PiperOrigin-RevId: 292923058
2020-02-07 13:35:00 -05:00
Abseil Team
74b44b2d0f Googletest export
Disable warning C4800 for Visual Studio 2019.

The compiler warning C4800 is disabled by default in Visual Studio 2019,
but it can be enabled on the command line. The only version of
Visual Studio that does not support warning C4800 is Visual Studio 2017.

PiperOrigin-RevId: 292624510
2020-02-07 13:34:51 -05:00