aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkosak <kosak@google.com>2013-12-03 22:46:51 +0000
committerkosak <kosak@google.com>2013-12-03 22:46:51 +0000
commitb72d18ca553c7af15254a89f1e596b9b8d77e10f (patch)
tree0e108490f562f0cd5b36a3eae76b1bf9a4aede73
parent5f2a6ca4fd5e1ab6330be758ea88bfe778af2b77 (diff)
downloadgoogletest-b72d18ca553c7af15254a89f1e596b9b8d77e10f.tar.gz
googletest-b72d18ca553c7af15254a89f1e596b9b8d77e10f.tar.bz2
googletest-b72d18ca553c7af15254a89f1e596b9b8d77e10f.zip
Clarify the rationale for gmock_all_test.cc, and pull in gtest 669
-rw-r--r--test/gmock_all_test.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/gmock_all_test.cc b/test/gmock_all_test.cc
index 691aac84..56d6c49c 100644
--- a/test/gmock_all_test.cc
+++ b/test/gmock_all_test.cc
@@ -31,8 +31,11 @@
//
// Tests for Google C++ Mocking Framework (Google Mock)
//
-// Sometimes it's desirable to build most of Google Mock's own tests
-// by compiling a single file. This file serves this purpose.
+// Some users use a build system that Google Mock doesn't support directly,
+// yet they still want to build and run Google Mock's own tests. This file
+// includes most such tests, making it easier for these users to maintain
+// their build scripts (they just need to build this file, even though the
+// below list of actual *_test.cc files might change).
#include "test/gmock-actions_test.cc"
#include "test/gmock-cardinalities_test.cc"
#include "test/gmock-generated-actions_test.cc"