diff options
author | shiqian <shiqian@861a406c-534a-0410-8894-cb66d6ee9925> | 2008-10-11 07:20:02 (GMT) |
---|---|---|
committer | shiqian <shiqian@861a406c-534a-0410-8894-cb66d6ee9925> | 2008-10-11 07:20:02 (GMT) |
commit | e0865dd9199e8fffd5c2f95a68de6c1851f77c15 (patch) | |
tree | 975905bb872df284353ddfc50f930f48979ec4d3 /Makefile.am | |
parent | 0cbe322d372e7f3463c7d49628ddad871334691d (diff) | |
download | googletest-e0865dd9199e8fffd5c2f95a68de6c1851f77c15.zip googletest-e0865dd9199e8fffd5c2f95a68de6c1851f77c15.tar.gz googletest-e0865dd9199e8fffd5c2f95a68de6c1851f77c15.tar.bz2 |
Many changes:
- appends "_" to internal macro names (by Markus Heule).
- makes Google Test work with newer versions of tools on Symbian and Windows CE (by Mika Raento).
- adds the (ASSERT|EXPECT)_NO_FATAL_FAILURE macros (by Markus Heule).
- changes EXPECT_(NON|)FATAL_FAILURE to catch failures in the current thread only (by Markus Heule).
- adds the EXPECT_(NON|)FATAL_FAILURE_ON_ALL_THREADS macros (by Markus Heule).
- adds GTEST_HAS_PTHREAD and GTEST_IS_THREADSAFE to indicate the availability of <pthread.h> and Google Test's thread-safety (by Zhanyong Wan).
- adds scons/SConscript for building with scons (by Joi Sigurdsson).
- adds src/gtest-all.cc for building Google Test from a single file (by Markus Heule).
- updates the xcode project to include new tests (by Preston Jackson).
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index ec8a4a2..fba0c26 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,8 @@ EXTRA_DIST = \ CHANGES \ CONTRIBUTORS \ include/gtest/internal/gtest-type-util.h.pump \ - scripts/gen_gtest_pred_impl.py + scripts/gen_gtest_pred_impl.py \ + src/gtest-all.cc # MSVC project files EXTRA_DIST += \ @@ -69,6 +70,7 @@ lib_libgtest_la_SOURCES = src/gtest.cc \ src/gtest-filepath.cc \ src/gtest-internal-inl.h \ src/gtest-port.cc \ + src/gtest-test-part.cc \ src/gtest-typed-test.cc pkginclude_HEADERS = include/gtest/gtest.h \ @@ -77,6 +79,7 @@ pkginclude_HEADERS = include/gtest/gtest.h \ include/gtest/gtest-spi.h \ include/gtest/gtest_pred_impl.h \ include/gtest/gtest_prod.h \ + include/gtest/gtest-test-part.h \ include/gtest/gtest-typed-test.h pkginclude_internaldir = $(pkgincludedir)/internal @@ -207,11 +210,21 @@ check_PROGRAMS += test/gtest_repeat_test test_gtest_repeat_test_SOURCES = test/gtest_repeat_test.cc test_gtest_repeat_test_LDADD = lib/libgtest.la +TESTS += test/gtest_sole_header_test +check_PROGRAMS += test/gtest_sole_header_test +test_gtest_sole_header_test_SOURCES = test/gtest_sole_header_test.cc +test_gtest_sole_header_test_LDADD = lib/libgtest_main.la + TESTS += test/gtest_stress_test check_PROGRAMS += test/gtest_stress_test test_gtest_stress_test_SOURCES = test/gtest_stress_test.cc test_gtest_stress_test_LDADD = lib/libgtest.la +TESTS += test/gtest-test-part_test +check_PROGRAMS += test/gtest-test-part_test +test_gtest_test_part_test_SOURCES = test/gtest-test-part_test.cc +test_gtest_test_part_test_LDADD = lib/libgtest_main.la + TESTS += test/gtest-typed-test_test check_PROGRAMS += test/gtest-typed-test_test test_gtest_typed_test_test_SOURCES = test/gtest-typed-test_test.cc \ |