suyu/breakpad
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/breakpad synced 2024-11-21 14:29:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix test breakage from 9aa786f

Browse source 
After
9aa786f03d,
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 <vapier@chromium.org>
This commit is contained in:
Ian Barkley-Yeung 2022-12-22 17:33:01 -08:00
parent b14bb95d5d
commit 6e03dc0f20
2 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -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

34
Makefile.in
View file

@ -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 \