Fix incremental builds after GoogleTest update
ClosedPublic
Actions

Authored by dim on Aug 15 2023, 9:15 PM.

Details

Reviewers

des
emaste
jhb
jrtc27

Commits

rGd5af300a69f1: Fix incremental builds after GoogleTest update

Summary

At the moment, several Makefiles under tests/ do not correctly generate
.depend files, which can lead to link errors when doing incremental
(e.g. WITHOUT_CLEAN) builds:

ld: error: undefined symbol: testing::internal::g_linked_ptr_mutex
>>> referenced by gtest-port.h:2137 (/usr/obj/usr/src/amd64.amd64/tmp/usr/include/private/gtest/internal/gtest-port.h:2137)
>>>               mockfs.o:(testing::internal::linked_ptr_internal::depart())
>>> referenced by gtest-port.h:2139 (/usr/obj/usr/src/amd64.amd64/tmp/usr/include/private/gtest/internal/gtest-port.h:2139)
>>>               mockfs.o:(testing::internal::linked_ptr_internal::depart())
>>> referenced by gtest-port.h:2139 (/usr/obj/usr/src/amd64.amd64/tmp/usr/include/private/gtest/internal/gtest-port.h:2139)
>>>               mockfs.o:(testing::internal::linked_ptr_internal::depart())
>>> referenced 3 more times

For the time being, put in a depend-cleanup.sh workaround for this.

Fixes: 28f6c2f29280
MFC after: 2 weeks

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

dim created this revision.Aug 15 2023, 9:15 PM

Herald added a subscriber: imp. · View Herald TranscriptAug 15 2023, 9:15 PM

dim requested review of this revision.Aug 15 2023, 9:15 PM

Harbormaster completed remote builds in B53124: Diff 126052.Aug 15 2023, 9:15 PM

emaste added inline comments.Aug 15 2023, 10:27 PM

tools/build/depend-cleanup.sh
210	Is `-U`/`--binary` beneficial too?

emaste accepted this revision.Aug 15 2023, 10:35 PM

This revision is now accepted and ready to land.Aug 15 2023, 10:35 PM

dim added inline comments.Aug 16 2023, 8:51 AM

tools/build/depend-cleanup.sh
210	It doesn't really matter, since we are using `-q` to shut up grep's output anyway. (`-U` is to "Search binary files, but do not attempt to print them".)