diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-15 20:02:54 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-15 20:02:54 (GMT) |
| commit | 1246e5807a94081049285e8fda4309f67ef571b4 (patch) | |
| tree | f2008a506ed390eb94da65cb8a0dc9351b7efb9b /googlemock/test/gmock_stress_test.cc | |
| parent | 4b6a7a49ab63f609630ce58c18a39c4048ab3ad5 (diff) | |
| parent | 2172c08c9241ab0cc8857980bbe925fe1a55cf3c (diff) | |
| download | googletest-1246e5807a94081049285e8fda4309f67ef571b4.zip googletest-1246e5807a94081049285e8fda4309f67ef571b4.tar.gz googletest-1246e5807a94081049285e8fda4309f67ef571b4.tar.bz2 | |
Merge branch 'master' into cleanup-cmake
Diffstat (limited to 'googlemock/test/gmock_stress_test.cc')
| -rw-r--r-- | googlemock/test/gmock_stress_test.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/googlemock/test/gmock_stress_test.cc b/googlemock/test/gmock_stress_test.cc index b9fdc45..0d99bed 100644 --- a/googlemock/test/gmock_stress_test.cc +++ b/googlemock/test/gmock_stress_test.cc @@ -26,20 +26,18 @@ // 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 that Google Mock constructs can be used in a large number of // threads concurrently. #include "gmock/gmock.h" - #include "gtest/gtest.h" namespace testing { namespace { -// From "gtest/internal/gtest-port.h". +// From gtest-port.h. using ::testing::internal::ThreadWithParam; // The maximum number of test threads (not including helper threads) |