Implements a subset of TR1 tuple needed by gtest and gmock (by Zhanyong Wan); cleaned up the Python tests (by Vlad Losev); made run_tests.py invokable from any directory (by Vlad Losev).
This commit is contained in:
17
Makefile.am
17
Makefile.am
@@ -300,6 +300,23 @@ test_gtest_no_rtti_test_SOURCES = test/gtest_unittest.cc \
|
||||
src/gtest_main.cc
|
||||
test_gtest_no_rtti_test_CXXFLAGS = $(AM_CXXFLAGS) -fno-rtti -DGTEST_HAS_RTTI=0
|
||||
|
||||
# Verifies that Google Test's own TR1 tuple implementation works.
|
||||
TESTS += test/gtest-tuple_test
|
||||
check_PROGRAMS += test/gtest-tuple_test
|
||||
test_gtest_tuple_test_SOURCES = test/gtest-tuple_test.cc \
|
||||
src/gtest-all.cc \
|
||||
src/gtest_main.cc
|
||||
test_gtest_tuple_test_CXXFLAGS = $(AM_CXXFLAGS) -DGTEST_USE_OWN_TR1_TUPLE=1
|
||||
|
||||
# Verifies that Google Test's features that use its own TR1 tuple work.
|
||||
TESTS += test/gtest_use_own_tuple_test
|
||||
check_PROGRAMS += test/gtest_use_own_tuple_test
|
||||
test_gtest_use_own_tuple_test_SOURCES = test/gtest-param-test_test.cc \
|
||||
test/gtest-param-test2_test.cc \
|
||||
src/gtest-all.cc
|
||||
test_gtest_use_own_tuple_test_CXXFLAGS = \
|
||||
$(AM_CXXFLAGS) -DGTEST_USE_OWN_TR1_TUPLE=1
|
||||
|
||||
# The following tests depend on the presence of a Python installation and are
|
||||
# keyed off of it. TODO(chandlerc@google.com): While we currently only attempt
|
||||
# to build and execute these tests if Autoconf has found Python v2.4 on the
|
||||
|
||||
Reference in New Issue
Block a user