Upgrade gtest to r267 and gmock to r173.

testing/gmock/Makefile.am

 # Nonstandard package files for distribution.
 EXTRA_DIST =
 
 # We may need to build our internally packaged gtest. If so, it will be
 # included in the 'subdirs' variable.
 SUBDIRS = $(subdirs)
 
 # Scripts and utilities to be installed by 'make install'.
 dist_bin_SCRIPTS = scripts/gmock_doctor.py
 bin_SCRIPTS = scripts/gmock-config
@@ skipping 117 matching lines @@
 TESTS += test/gmock-spec-builders_test
 check_PROGRAMS += test/gmock-spec-builders_test
 test_gmock_spec_builders_test_SOURCES = test/gmock-spec-builders_test.cc
 test_gmock_spec_builders_test_LDADD = $(GTEST_LIBS) lib/libgmock.la
 
 TESTS += test/gmock_test
 check_PROGRAMS += test/gmock_test
 test_gmock_test_SOURCES = test/gmock_test.cc
 test_gmock_test_LDADD = $(GTEST_LIBS) lib/libgmock_main.la
 
+# A sanity test for verifying that Google Mock works when RTTI is
+# disabled.  We pick gmock-spec-builders_test.cc as it exercises all
+# components of Google Mock.
+TESTS += test/gmock_no_rtti_test
+check_PROGRAMS += test/gmock_no_rtti_test
+test_gmock_no_rtti_test_SOURCES = test/gmock-spec-builders_test.cc \
+                                  src/gmock-all.cc
+test_gmock_no_rtti_test_CXXFLAGS = $(AM_CXXFLAGS) -fno-rtti -DGTEST_HAS_RTTI=0
+test_gmock_no_rtti_test_LDADD = $(GTEST_LIBS)
+
+# A sanity test for verifying that Google Mock works with Google
+# Test's TR1 tuple implementation.  We pick
+# gmock-spec-builders_test.cc as it exercises all components of Google
+# Mock.
+TESTS += test/gmock_use_own_tuple_test
+check_PROGRAMS += test/gmock_use_own_tuple_test
+test_gmock_use_own_tuple_test_SOURCES = test/gmock-spec-builders_test.cc \
+                                        src/gmock-all.cc
+test_gmock_use_own_tuple_test_CXXFLAGS = \
+    $(AM_CXXFLAGS) -DGTEST_USE_OWN_TR1_TUPLE=1
+test_gmock_use_own_tuple_test_LDADD = $(GTEST_LIBS)
+
 # The following tests depend on the presence of a Python installation and are
 # keyed off of it. We only add them to the TESTS variable when a Python
 # interpreter is available. TODO(chandlerc@google.com): While we currently only
 # attempt to build and execute these tests if Autoconf has found Python v2.3 on
 # the system, we don't use the PYTHON variable it specified as the valid
 # interpreter. The problem is that TESTS_ENVIRONMENT is a global variable, and
 # thus we cannot distinguish between C++ unit tests and Python unit tests.
 dist_check_SCRIPTS =
 
 # Python modules used by multiple Python tests below.
@@ skipping 53 matching lines @@
 # Microsoft Visual Studio 2005 projects.
 EXTRA_DIST += \
     msvc/gmock.sln \
     msvc/gmock.vcproj \
     msvc/gmock_config.vsprops \
     msvc/gmock_link_test.vcproj \
     msvc/gmock_main.vcproj \
     msvc/gmock_output_test_.vcproj \
     msvc/gmock-spec-builders_test.vcproj \
     msvc/gmock_test.vcproj