From 6e03dc0f20feb45851318e58015b53e6be954aed Mon Sep 17 00:00:00 2001 From: Ian Barkley-Yeung Date: Thu, 22 Dec 2022 17:33:01 -0800 Subject: [PATCH] Fix test breakage from 9aa786f After https://chromium.googlesource.com/breakpad/breakpad/+/9aa786f03dbd1fca98eeae42c35c54d61b2a83b9, attempts to roll breakpad into ChromeOS fail with: make[1]: *** No rule to make target 'src/testing/googletest/src/gtest-all.cc', needed by 'src/testing/googletest/src/client_linux_linux_client_unittest_shlib-gtest-all.o'. Stop. (see https://logs.chromium.org/logs/chromeos/buildbucket/cr-buildbucket/8794115289064657457/+/u/run_SDK_package_unit_tests/call_chromite.api.TestService_BuildTargetUnitTest/stdout, the result of dry-running https://chrome-internal-review.googlesource.com/c/chromeos/manifest-internal/+/5238479, which just updates the breakpad revision to b14bb95d5de268b6231dc8c667fb0f7d73676856.) Change-Id: Ia6e47c044e74499a849f8b615594f403893d7653 Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/4120547 Reviewed-by: Mike Frysinger --- Makefile.am | 2 +- Makefile.in | 34 +++++++++++++++++++--------------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9e66a685..9b7f7247 100644 --- a/Makefile.am +++ b/Makefile.am @@ -151,7 +151,6 @@ CLEANFILES = # if !SYSTEM_TEST_LIBS check_LIBRARIES += src/testing/libtesting.a -endif src_testing_libtesting_a_SOURCES = \ src/breakpad_googletest_includes.h \ src/testing/googletest/src/gtest-all.cc \ @@ -159,6 +158,7 @@ src_testing_libtesting_a_SOURCES = \ src/testing/googlemock/src/gmock-all.cc src_testing_libtesting_a_CPPFLAGS = \ $(AM_CPPFLAGS) $(TEST_CFLAGS) +endif # # General diff --git a/Makefile.in b/Makefile.in index 17a45351..d358b6b1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -482,10 +482,14 @@ am_src_libbreakpad_a_OBJECTS = \ src_libbreakpad_a_OBJECTS = $(am_src_libbreakpad_a_OBJECTS) src_testing_libtesting_a_AR = $(AR) $(ARFLAGS) src_testing_libtesting_a_LIBADD = -am_src_testing_libtesting_a_OBJECTS = \ - src/testing/googletest/src/libtesting_a-gtest-all.$(OBJEXT) \ - src/testing/googletest/src/libtesting_a-gtest_main.$(OBJEXT) \ - src/testing/googlemock/src/libtesting_a-gmock-all.$(OBJEXT) +am__src_testing_libtesting_a_SOURCES_DIST = \ + src/breakpad_googletest_includes.h \ + src/testing/googletest/src/gtest-all.cc \ + src/testing/googletest/src/gtest_main.cc \ + src/testing/googlemock/src/gmock-all.cc +@SYSTEM_TEST_LIBS_FALSE@am_src_testing_libtesting_a_OBJECTS = src/testing/googletest/src/libtesting_a-gtest-all.$(OBJEXT) \ +@SYSTEM_TEST_LIBS_FALSE@ src/testing/googletest/src/libtesting_a-gtest_main.$(OBJEXT) \ +@SYSTEM_TEST_LIBS_FALSE@ src/testing/googlemock/src/libtesting_a-gmock-all.$(OBJEXT) src_testing_libtesting_a_OBJECTS = \ $(am_src_testing_libtesting_a_OBJECTS) src_third_party_libdisasm_libdisasm_a_AR = $(AR) $(ARFLAGS) @@ -549,9 +553,9 @@ am__src_client_linux_linux_client_unittest_shlib_SOURCES_DIST = \ src/processor/proc_maps_linux.cc \ src/common/linux/breakpad_getcontext.S \ src/common/linux/breakpad_getcontext_unittest.cc -am__objects_2 = src/testing/googletest/src/client_linux_linux_client_unittest_shlib-gtest-all.$(OBJEXT) \ - src/testing/googletest/src/client_linux_linux_client_unittest_shlib-gtest_main.$(OBJEXT) \ - src/testing/googlemock/src/client_linux_linux_client_unittest_shlib-gmock-all.$(OBJEXT) +@SYSTEM_TEST_LIBS_FALSE@am__objects_2 = src/testing/googletest/src/client_linux_linux_client_unittest_shlib-gtest-all.$(OBJEXT) \ +@SYSTEM_TEST_LIBS_FALSE@ src/testing/googletest/src/client_linux_linux_client_unittest_shlib-gtest_main.$(OBJEXT) \ +@SYSTEM_TEST_LIBS_FALSE@ src/testing/googlemock/src/client_linux_linux_client_unittest_shlib-gmock-all.$(OBJEXT) @HAVE_GETCONTEXT_FALSE@am__objects_3 = src/common/linux/client_linux_linux_client_unittest_shlib-breakpad_getcontext.$(OBJEXT) \ @HAVE_GETCONTEXT_FALSE@ src/common/linux/client_linux_linux_client_unittest_shlib-breakpad_getcontext_unittest.$(OBJEXT) am_src_client_linux_linux_client_unittest_shlib_OBJECTS = \ @@ -1664,7 +1668,7 @@ SOURCES = $(src_client_linux_libbreakpad_client_a_SOURCES) \ DIST_SOURCES = \ $(am__src_client_linux_libbreakpad_client_a_SOURCES_DIST) \ $(src_libbreakpad_a_SOURCES) \ - $(src_testing_libtesting_a_SOURCES) \ + $(am__src_testing_libtesting_a_SOURCES_DIST) \ $(src_third_party_libdisasm_libdisasm_a_SOURCES) \ $(src_client_linux_linux_client_unittest_SOURCES) \ $(am__src_client_linux_linux_client_unittest_shlib_SOURCES_DIST) \ @@ -2155,14 +2159,14 @@ noinst_LIBRARIES = $(am__append_7) lib_LIBRARIES = $(am__append_5) $(am__append_11) noinst_SCRIPTS = $(check_SCRIPTS) CLEANFILES = $(am__append_15) -src_testing_libtesting_a_SOURCES = \ - src/breakpad_googletest_includes.h \ - src/testing/googletest/src/gtest-all.cc \ - src/testing/googletest/src/gtest_main.cc \ - src/testing/googlemock/src/gmock-all.cc +@SYSTEM_TEST_LIBS_FALSE@src_testing_libtesting_a_SOURCES = \ +@SYSTEM_TEST_LIBS_FALSE@ src/breakpad_googletest_includes.h \ +@SYSTEM_TEST_LIBS_FALSE@ src/testing/googletest/src/gtest-all.cc \ +@SYSTEM_TEST_LIBS_FALSE@ src/testing/googletest/src/gtest_main.cc \ +@SYSTEM_TEST_LIBS_FALSE@ src/testing/googlemock/src/gmock-all.cc -src_testing_libtesting_a_CPPFLAGS = \ - $(AM_CPPFLAGS) $(TEST_CFLAGS) +@SYSTEM_TEST_LIBS_FALSE@src_testing_libtesting_a_CPPFLAGS = \ +@SYSTEM_TEST_LIBS_FALSE@ $(AM_CPPFLAGS) $(TEST_CFLAGS) @DISABLE_PROCESSOR_FALSE@check_SCRIPTS = \ @DISABLE_PROCESSOR_FALSE@ src/processor/microdump_stackwalk_test \