diff options
author | Gennadiy Civil <misterg@google.com> | 2018-06-11 15:26:16 (GMT) |
---|---|---|
committer | Gennadiy Civil <misterg@google.com> | 2018-06-11 15:26:16 (GMT) |
commit | de47b0d30c1d2a2072eb1c2a2e852d6aaa028931 (patch) | |
tree | e3b480f265889cb79488e15ea02feb48f8893bf3 /googlemock | |
parent | 98a0d007d7092b72eea0e501bb9ad17908a1a036 (diff) | |
download | googletest-de47b0d30c1d2a2072eb1c2a2e852d6aaa028931.zip googletest-de47b0d30c1d2a2072eb1c2a2e852d6aaa028931.tar.gz googletest-de47b0d30c1d2a2072eb1c2a2e852d6aaa028931.tar.bz2 |
Rename "Primer.md" to "primer.md" and adjust links. Part of the documentaion rationalzation
Diffstat (limited to 'googlemock')
-rw-r--r-- | googlemock/README.md | 16 | ||||
-rw-r--r-- | googlemock/docs/CheatSheet.md | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/googlemock/README.md b/googlemock/README.md index 1170cfa..ad374de 100644 --- a/googlemock/README.md +++ b/googlemock/README.md @@ -53,7 +53,7 @@ the Apache License, which is different from Google Mock's license. If you are new to the project, we suggest that you read the user documentation in the following order: - * Learn the [basics](../../master/googletest/docs/Primer.md) of + * Learn the [basics](../../master/googletest/docs/primer.md) of Google Test, if you choose to use Google Mock with it (recommended). * Read [Google Mock for Dummies](../../master/googlemock/docs/ForDummies.md). * Read the instructions below on how to build Google Mock. @@ -129,20 +129,20 @@ build Google Mock and its tests, which has further requirements: If you have CMake available, it is recommended that you follow the [build instructions][gtest_cmakebuild] -as described for Google Test. +as described for Google Test. If are using Google Mock with an existing CMake project, the section [Incorporating Into An Existing CMake Project][gtest_incorpcmake] -may be of particular interest. -To make it work for Google Mock you will need to change +may be of particular interest. +To make it work for Google Mock you will need to change target_link_libraries(example gtest_main) -to +to target_link_libraries(example gmock_main) - + This works because `gmock_main` library is compiled with Google Test. However, it does not automatically add Google Test includes. Therefore you will also have to change @@ -161,8 +161,8 @@ to "${gtest_SOURCE_DIR}/include" "${gmock_SOURCE_DIR}/include") endif() -This will addtionally mark Google Mock includes as system, which will -silence compiler warnings when compiling your tests using clang with +This will addtionally mark Google Mock includes as system, which will +silence compiler warnings when compiling your tests using clang with `-Wpedantic -Wall -Wextra -Wconversion`. diff --git a/googlemock/docs/CheatSheet.md b/googlemock/docs/CheatSheet.md index f8bbbfe..d078b42 100644 --- a/googlemock/docs/CheatSheet.md +++ b/googlemock/docs/CheatSheet.md @@ -349,7 +349,7 @@ You can make a matcher from one or more other matchers: ## Matchers as Test Assertions ## -|`ASSERT_THAT(expression, m)`|Generates a [fatal failure](../../googletest/docs/Primer.md#assertions) if the value of `expression` doesn't match matcher `m`.| +|`ASSERT_THAT(expression, m)`|Generates a [fatal failure](../../googletest/docs/primer.md#assertions) if the value of `expression` doesn't match matcher `m`.| |:---------------------------|:----------------------------------------------------------------------------------------------------------------------------------------------| |`EXPECT_THAT(expression, m)`|Generates a non-fatal failure if the value of `expression` doesn't match matcher `m`. | |