diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-04-22 22:25:31 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-04-22 22:25:31 +0000 |
| commit | acba0d1a96875ea0bbc69b9e91e7adb99ad8b15f (patch) | |
| tree | 9c04a37b5aa0cf26aff318ae43cbf4cacca1755f /Makefile.am | |
| parent | c9da04c70d95f5a9a4a67d93ae20fbb91caf42e9 (diff) | |
| download | googlemock-acba0d1a96875ea0bbc69b9e91e7adb99ad8b15f.tar.gz | |
Implements --gmock_catch_leaked_mocks and Mock::AllowLeak.
git-svn-id: http://googlemock.googlecode.com/svn/trunk@139 8415998a-534a-0410-bf83-d39667b30386
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index f70a808..7a821a0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -128,7 +128,7 @@ test_gmock_printers_test_LDADD = $(GTEST_LIBS) lib/libgmock_main.la 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_main.la +test_gmock_spec_builders_test_LDADD = $(GTEST_LIBS) lib/libgmock.la TESTS += test/gmock_test check_PROGRAMS += test/gmock_test @@ -147,6 +147,11 @@ dist_check_SCRIPTS = # Python modules used by multiple Python tests below. dist_check_SCRIPTS += test/gmock_test_utils.py +check_PROGRAMS += test/gmock_leak_test_ +test_gmock_leak_test__SOURCES = test/gmock_leak_test_.cc +test_gmock_leak_test__LDADD = $(GTEST_LIBS) lib/libgmock_main.la +dist_check_SCRIPTS += test/gmock_leak_test.py + check_PROGRAMS += test/gmock_output_test_ test_gmock_output_test__SOURCES = test/gmock_output_test_.cc test_gmock_output_test__LDADD = $(GTEST_LIBS) lib/libgmock_main.la @@ -155,15 +160,17 @@ EXTRA_DIST += test/gmock_output_test_golden.txt # Enable all the python driven tests when we can run them. if HAVE_PYTHON -TESTS += test/gmock_output_test.py +TESTS += \ + test/gmock_leak_test.py \ + test/gmock_output_test.py endif # Nonstandard package files for distribution. EXTRA_DIST += \ - CHANGES \ - CONTRIBUTORS \ - make/Makefile \ - src/gmock-all.cc + CHANGES \ + CONTRIBUTORS \ + make/Makefile \ + src/gmock-all.cc # Pump scripts for generating Google Mock headers. # TODO(chandlerc@google.com): automate the generation of *.h from *.h.pump. @@ -199,4 +206,5 @@ EXTRA_DIST += \ msvc/gmock_link_test.vcproj \ msvc/gmock_main.vcproj \ msvc/gmock_output_test_.vcproj \ + msvc/gmock-spec-builders_test.vcproj \ msvc/gmock_test.vcproj |