diff options
| author | Conor Burgess <Burgess.Conor@gmail.com> | 2018-08-17 16:15:32 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-17 16:15:32 (GMT) |
| commit | 687964c84f798ce331fc60f6b8f212410ef46b3c (patch) | |
| tree | 20ed743afd555c46b91361cf864c76643f1d89b2 /googletest/test/gtest_all_test.cc | |
| parent | f11a8f9131584cf4009eca8af8a66e920c1b7391 (diff) | |
| parent | 02a8ca87735601466d8c564344f9be493da84708 (diff) | |
| download | googletest-687964c84f798ce331fc60f6b8f212410ef46b3c.zip googletest-687964c84f798ce331fc60f6b8f212410ef46b3c.tar.gz googletest-687964c84f798ce331fc60f6b8f212410ef46b3c.tar.bz2 | |
Merge branch 'master' into fix-argc
Diffstat (limited to 'googletest/test/gtest_all_test.cc')
| -rw-r--r-- | googletest/test/gtest_all_test.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/googletest/test/gtest_all_test.cc b/googletest/test/gtest_all_test.cc index 955aa62..e61e36b 100644 --- a/googletest/test/gtest_all_test.cc +++ b/googletest/test/gtest_all_test.cc @@ -26,21 +26,20 @@ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + // -// Author: wan@google.com (Zhanyong Wan) -// -// Tests for Google C++ Testing Framework (Google Test) +// Tests for Google C++ Testing and Mocking Framework (Google Test) // // Sometimes it's desirable to build most of Google Test's own tests // by compiling a single file. This file serves this purpose. -#include "test/gtest-filepath_test.cc" -#include "test/gtest-linked_ptr_test.cc" -#include "test/gtest-message_test.cc" -#include "test/gtest-options_test.cc" -#include "test/gtest-port_test.cc" +#include "test/googletest-filepath-test.cc" +#include "test/googletest-linked-ptr-test.cc" +#include "test/googletest-message-test.cc" +#include "test/googletest-options-test.cc" +#include "test/googletest-port-test.cc" #include "test/gtest_pred_impl_unittest.cc" #include "test/gtest_prod_test.cc" -#include "test/gtest-test-part_test.cc" +#include "test/googletest-test-part-test.cc" #include "test/gtest-typed-test_test.cc" #include "test/gtest-typed-test2_test.cc" #include "test/gtest_unittest.cc" |