aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBilly Donahue <billydonahue@google.com>2015-08-25 17:56:57 -0400
committerBilly Donahue <billydonahue@google.com>2015-08-25 17:56:57 -0400
commit7563fe553e7e28fcfdc1be264ee5f8758686868b (patch)
tree4fcb5a8df996ab8e0d923d38f11326c18c7ab74e
parent67f6188c8fc39439965431100507006bf4a11f71 (diff)
downloadgoogletest-7563fe553e7e28fcfdc1be264ee5f8758686868b.tar.gz
googletest-7563fe553e7e28fcfdc1be264ee5f8758686868b.tar.bz2
googletest-7563fe553e7e28fcfdc1be264ee5f8758686868b.zip
cat _home.md files into README.md
-rw-r--r--README.md (renamed from googlemock_home.md)42
-rw-r--r--googletest_home.md31
2 files changed, 32 insertions, 41 deletions
diff --git a/googlemock_home.md b/README.md
index 3ed9d84c..01edbb0e 100644
--- a/googlemock_home.md
+++ b/README.md
@@ -1,12 +1,3 @@
-
-
-Please follow **Google Mock** to its new home on **Git Hub**!
-> http://github.com/google/googlemock
-
-
----
-
-
Welcome to **Google C++ Mocking Framework**!
Inspired by [jMock](http://www.jmock.org/), [EasyMock](http://www.easymock.org/), and [Hamcrest](http://code.google.com/p/hamcrest/), and
@@ -62,4 +53,35 @@ discussion group.
We'd love to have your help! Please
read the DevGuide if you are willing to contribute to the development.
-Happy mocking! \ No newline at end of file
+Happy mocking!
+
+
+Google's framework for writing C++ tests on a variety of platforms
+(Linux, Mac OS X, Windows, Cygwin, Windows CE, and Symbian). Based on
+the xUnit architecture. Supports automatic test discovery, a rich set
+of assertions, user-defined assertions, death tests, fatal and
+non-fatal failures, value- and type-parameterized tests, various
+options for running the tests, and XML test report generation.
+
+## Getting Started ##
+
+After downloading Google Test, unpack it, read the README file and the documentation wiki pages (listed on the right side of this front page).
+
+## Who Is Using Google Test? ##
+
+In addition to many internal projects at Google, Google Test is also used by
+the following notable projects:
+
+ * The [Chromium projects](http://www.chromium.org/) (behind the Chrome browser and Chrome OS)
+ * The [LLVM](http://llvm.org/) compiler
+ * [Protocol Buffers](http://code.google.com/p/protobuf/) (Google's data interchange format)
+ * The [OpenCV](http://opencv.org/) computer vision library
+
+If you know of a project that's using Google Test and want it to be listed here, please let
+`googletestframework@googlegroups.com` know.
+
+## Google Test-related open source projects ##
+
+[Google Test UI](http://code.google.com/p/gtest-gbar/) is test runner that runs your test binary, allows you to track its progress via a progress bar, and displays a list of test failures. Clicking on one shows failure text. Google Test UI is written in C#.
+
+[GTest TAP Listener](https://github.com/kinow/gtest-tap-listener) is an event listener for Google Test that implements the [TAP protocol](http://en.wikipedia.org/wiki/Test_Anything_Protocol) for test result output. If your test runner understands TAP, you may find it useful.
diff --git a/googletest_home.md b/googletest_home.md
deleted file mode 100644
index a0ce0aef..00000000
--- a/googletest_home.md
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-Google's framework for writing C++ tests on a variety of platforms
-(Linux, Mac OS X, Windows, Cygwin, Windows CE, and Symbian). Based on
-the xUnit architecture. Supports automatic test discovery, a rich set
-of assertions, user-defined assertions, death tests, fatal and
-non-fatal failures, value- and type-parameterized tests, various
-options for running the tests, and XML test report generation.
-
-## Getting Started ##
-
-After downloading Google Test, unpack it, read the README file and the documentation wiki pages (listed on the right side of this front page).
-
-## Who Is Using Google Test? ##
-
-In addition to many internal projects at Google, Google Test is also used by
-the following notable projects:
-
- * The [Chromium projects](http://www.chromium.org/) (behind the Chrome browser and Chrome OS)
- * The [LLVM](http://llvm.org/) compiler
- * [Protocol Buffers](http://code.google.com/p/protobuf/) (Google's data interchange format)
- * The [OpenCV](http://opencv.org/) computer vision library
-
-If you know of a project that's using Google Test and want it to be listed here, please let
-`googletestframework@googlegroups.com` know.
-
-## Google Test-related open source projects ##
-
-[Google Test UI](http://code.google.com/p/gtest-gbar/) is test runner that runs your test binary, allows you to track its progress via a progress bar, and displays a list of test failures. Clicking on one shows failure text. Google Test UI is written in C#.
-
-[GTest TAP Listener](https://github.com/kinow/gtest-tap-listener) is an event listener for Google Test that implements the [TAP protocol](http://en.wikipedia.org/wiki/Test_Anything_Protocol) for test result output. If your test runner understands TAP, you may find it useful. \ No newline at end of file