Updated gMock to 1.7.0

This change updates gMock to the new release, 1.7.0.  This is
necessary for Android, as Android Master has updated their gTest to
1.7.0, and we must always use the matching version of gMock.

This should not break any existing tests, as 1.7.0 is
backwards-compatible with 1.6.0 code in nearly all cases.  There are
a few bugfixes around being too generous with type coercion in
EXPECT_THAT() and ASSERT_THAT() that could break code that was
accepted by the compiler before but was never technically safe.

For a full list of changes, including all the awesome new matchers
you can now use in your tests, see CHANGES, which is included from
gMock unchanged.

For a full list of modifications made to allow this to work on
Android Master, see the updated README.android.

No changes to the GYP files were necessary as part of this upgrade.

Change-Id: Ib1445044e78c9fe0cf16031d544577d65ebbf6df
This commit is contained in:
Jeff Tinker
2014-03-10 11:37:24 -07:00
parent b2af1e6303
commit f6ec81ffe7
34 changed files with 3493 additions and 1629 deletions

View File

@@ -1,5 +1,5 @@
URL: https://code.google.com/p/googlemock/downloads/list
Version: 1.6.0
Version: 1.7.0
License: New BSD License
Description:
@@ -14,7 +14,35 @@ needs a different format of build script, and it needs to build against the OS'
modified version of gTest, rather than the packaged version.
Local Modifications:
Mon Mar 4, 2013 (juce)
--Mon Feb 4, 2014 (juce)--
Upgraded to gMock 1.7.0. This is required for compatibility with the upgrade
of gTest on Android Master to 1.7.0. Note that after this change, this code
will no longer work on Android KLP branches. Our gMock must match the version
of gTest in the Android tree.
Updated src/Android.mk to turn on the gTest replacement for std::tr1::tuple.
On Android, gTest builds without using the platform's std::tr1::tuple (which
does not exist on Android) and without gTest's implementation of a subset of
std::tr1::tuple. This works on Android because it omits the few features that
rely on std::tr1::tuple. But gMock was written assuming std::tuple or the
gTest-defined subset would be available, and it cannot be used without one or
the other.
Updated src/Android.mk to account for the new compilers on Android Master.
Removed the unused Host build from src/Android.mk.
Updated the android-rsync-excludes file to reflect the new source and sorted it
alphabetically.
Updated Dr. gMock (which was again omitted from the release) to version 1.7.0.
--Wed Mar 20, 2013 (juce)--
Added the Dr. gMock script, which was missing from the 1.6.0 distribution.
--Mon Mar 4, 2013 (juce)--
Added this documentation