diff options
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 115 |
1 files changed, 62 insertions, 53 deletions
diff --git a/Makefile.am b/Makefile.am index 17076799..51d19fba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -120,8 +120,10 @@ TEST_DEPS = else TEST_CFLAGS = \ -I$(top_srcdir)/src/testing/include \ - -I$(top_srcdir)/src/testing/gtest/include \ - -I$(top_srcdir)/src/testing/gtest \ + -I$(top_srcdir)/src/testing/googletest/include \ + -I$(top_srcdir)/src/testing/googletest \ + -I$(top_srcdir)/src/testing/googlemock/include \ + -I$(top_srcdir)/src/testing/googlemock \ -I$(top_srcdir)/src/testing TEST_LIBS = src/testing/libtesting.a TEST_DEPS = $(TEST_LIBS) @@ -141,9 +143,9 @@ check_LIBRARIES += src/testing/libtesting.a if !SYSTEM_TEST_LIBS src_testing_libtesting_a_SOURCES = \ src/breakpad_googletest_includes.h \ - src/testing/gtest/src/gtest-all.cc \ - src/testing/gtest/src/gtest_main.cc \ - src/testing/src/gmock-all.cc + src/testing/googletest/src/gtest-all.cc \ + src/testing/googletest/src/gtest_main.cc \ + src/testing/googlemock/src/gmock-all.cc src_testing_libtesting_a_CPPFLAGS = \ $(AM_CPPFLAGS) $(TEST_CFLAGS) endif @@ -1401,54 +1403,61 @@ EXTRA_DIST = \ src/processor/testdata/symbols/overflow/B0E1FC01EF48E39CAF5C881D2DF0C3840/overflow.sym \ src/processor/testdata/symbols/test_app.pdb/5A9832E5287241C1838ED98914E9B7FF1/test_app.sym \ src/processor/testdata/test_app.cc \ - src/testing/gtest/include/gtest/gtest.h \ - src/testing/gtest/include/gtest/gtest-death-test.h \ - src/testing/gtest/include/gtest/gtest-message.h \ - src/testing/gtest/include/gtest/gtest-param-test.h \ - src/testing/gtest/include/gtest/gtest-printers.h \ - src/testing/gtest/include/gtest/gtest-spi.h \ - src/testing/gtest/include/gtest/gtest-test-part.h \ - src/testing/gtest/include/gtest/gtest-typed-test.h \ - src/testing/gtest/include/gtest/gtest_pred_impl.h \ - src/testing/gtest/include/gtest/gtest_prod.h \ - src/testing/gtest/include/gtest/internal/gtest-death-test-internal.h \ - src/testing/gtest/include/gtest/internal/gtest-filepath.h \ - src/testing/gtest/include/gtest/internal/gtest-internal.h \ - src/testing/gtest/include/gtest/internal/gtest-linked_ptr.h \ - src/testing/gtest/include/gtest/internal/gtest-param-util-generated.h \ - src/testing/gtest/include/gtest/internal/gtest-param-util.h \ - src/testing/gtest/include/gtest/internal/gtest-port.h \ - src/testing/gtest/include/gtest/internal/gtest-string.h \ - src/testing/gtest/include/gtest/internal/gtest-tuple.h \ - src/testing/gtest/include/gtest/internal/gtest-type-util.h \ - src/testing/gtest/src/gtest.cc \ - src/testing/gtest/src/gtest-death-test.cc \ - src/testing/gtest/src/gtest-filepath.cc \ - src/testing/gtest/src/gtest-internal-inl.h \ - src/testing/gtest/src/gtest-port.cc \ - src/testing/gtest/src/gtest-printers.cc \ - src/testing/gtest/src/gtest-test-part.cc \ - src/testing/gtest/src/gtest-typed-test.cc \ - src/testing/include/gmock/gmock.h \ - src/testing/include/gmock/gmock-actions.h \ - src/testing/include/gmock/gmock-cardinalities.h \ - src/testing/include/gmock/gmock-generated-actions.h \ - src/testing/include/gmock/gmock-generated-function-mockers.h \ - src/testing/include/gmock/gmock-generated-matchers.h \ - src/testing/include/gmock/gmock-generated-nice-strict.h \ - src/testing/include/gmock/gmock-matchers.h \ - src/testing/include/gmock/gmock-more-actions.h \ - src/testing/include/gmock/gmock-more-matchers.h \ - src/testing/include/gmock/gmock-spec-builders.h \ - src/testing/include/gmock/internal/gmock-generated-internal-utils.h \ - src/testing/include/gmock/internal/gmock-internal-utils.h \ - src/testing/include/gmock/internal/gmock-port.h \ - src/testing/src/gmock.cc \ - src/testing/src/gmock-cardinalities.cc \ - src/testing/src/gmock-internal-utils.cc \ - src/testing/src/gmock-matchers.cc \ - src/testing/src/gmock-spec-builders.cc \ - src/testing/src/gmock_main.cc \ + src/testing/googletest/include/gtest/gtest.h \ + src/testing/googletest/include/gtest/gtest-death-test.h \ + src/testing/googletest/include/gtest/gtest-message.h \ + src/testing/googletest/include/gtest/gtest-param-test.h \ + src/testing/googletest/include/gtest/gtest-printers.h \ + src/testing/googletest/include/gtest/gtest-spi.h \ + src/testing/googletest/include/gtest/gtest-test-part.h \ + src/testing/googletest/include/gtest/gtest-typed-test.h \ + src/testing/googletest/include/gtest/gtest_pred_impl.h \ + src/testing/googletest/include/gtest/gtest_prod.h \ + src/testing/googletest/include/gtest/internal/custom/gtest-port.h \ + src/testing/googletest/include/gtest/internal/custom/gtest-printers.h \ + src/testing/googletest/include/gtest/internal/custom/gtest.h \ + src/testing/googletest/include/gtest/internal/gtest-death-test-internal.h \ + src/testing/googletest/include/gtest/internal/gtest-filepath.h \ + src/testing/googletest/include/gtest/internal/gtest-internal.h \ + src/testing/googletest/include/gtest/internal/gtest-linked_ptr.h \ + src/testing/googletest/include/gtest/internal/gtest-param-util-generated.h \ + src/testing/googletest/include/gtest/internal/gtest-param-util.h \ + src/testing/googletest/include/gtest/internal/gtest-port-arch.h \ + src/testing/googletest/include/gtest/internal/gtest-port.h \ + src/testing/googletest/include/gtest/internal/gtest-string.h \ + src/testing/googletest/include/gtest/internal/gtest-tuple.h \ + src/testing/googletest/include/gtest/internal/gtest-type-util.h \ + src/testing/googletest/src/gtest.cc \ + src/testing/googletest/src/gtest-death-test.cc \ + src/testing/googletest/src/gtest-filepath.cc \ + src/testing/googletest/src/gtest-internal-inl.h \ + src/testing/googletest/src/gtest-port.cc \ + src/testing/googletest/src/gtest-printers.cc \ + src/testing/googletest/src/gtest-test-part.cc \ + src/testing/googletest/src/gtest-typed-test.cc \ + src/testing/googlemock/include/gmock/gmock.h \ + src/testing/googlemock/include/gmock/gmock-actions.h \ + src/testing/googlemock/include/gmock/gmock-cardinalities.h \ + src/testing/googlemock/include/gmock/gmock-generated-actions.h \ + src/testing/googlemock/include/gmock/gmock-generated-function-mockers.h \ + src/testing/googlemock/include/gmock/gmock-generated-matchers.h \ + src/testing/googlemock/include/gmock/gmock-generated-nice-strict.h \ + src/testing/googlemock/include/gmock/gmock-matchers.h \ + src/testing/googlemock/include/gmock/gmock-more-actions.h \ + src/testing/googlemock/include/gmock/gmock-more-matchers.h \ + src/testing/googlemock/include/gmock/gmock-spec-builders.h \ + src/testing/googlemock/include/gmock/internal/custom/gmock-generated-actions.h \ + src/testing/googlemock/include/gmock/internal/custom/gmock-matchers.h \ + src/testing/googlemock/include/gmock/internal/custom/gmock-port.h \ + src/testing/googlemock/include/gmock/internal/gmock-generated-internal-utils.h \ + src/testing/googlemock/include/gmock/internal/gmock-internal-utils.h \ + src/testing/googlemock/include/gmock/internal/gmock-port.h \ + src/testing/googlemock/src/gmock.cc \ + src/testing/googlemock/src/gmock-cardinalities.cc \ + src/testing/googlemock/src/gmock-internal-utils.cc \ + src/testing/googlemock/src/gmock-matchers.cc \ + src/testing/googlemock/src/gmock-spec-builders.cc \ + src/testing/googlemock/src/gmock_main.cc \ src/third_party/curl/COPYING \ src/third_party/curl/curlbuild.h \ src/third_party/curl/curl.h \ |