mk: Move vm stack test debug symbols
ClosedPublic
Actions

Authored by jlduran on Feb 1 2025, 4:11 PM.

Details

Reviewers

emaste
bdrewery

Commits

rGceab30bfe243: mk: Move vm stack test debug symbols
rG911d0089d0ff: mk: Move vm stack test debug symbols
rG88d448ec815c: mk: Move vm stack test debug symbols

Summary

Avoid the creation of a /usr/tests/sys/vm/stack/.debug directory by
placing sys/vm/stack test debug symbols under /usr/lib/debug.

Test Plan

Let someone who actually understands our make system, fix this issue.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 62234
Build 59118: arc lint + arc unit

Event Timeline

jlduran created this revision.Feb 1 2025, 4:11 PM

Herald added a subscriber: imp. · View Herald TranscriptFeb 1 2025, 4:11 PM

jlduran requested review of this revision.Feb 1 2025, 4:11 PM

Harbormaster completed remote builds in B62207: Diff 150368.Feb 1 2025, 4:11 PM

bsd.prog.mk has:

# Use ${DEBUGDIR} for base system debug files, else .debug subdirectory
.if defined(BINDIR) && (\
    ${BINDIR} == "/bin" ||\
    ${BINDIR:C%/libexec(/.*)?%/libexec%} == "/libexec" ||\
    ${BINDIR} == "/sbin" ||\
    ${BINDIR:C%/usr/(bin|bsdinstall|libexec|lpr|sendmail|sm.bin|sbin|tests)(/.*)?%/usr/bin%} == "/usr/bin" ||\
    ${BINDIR} == "/usr/lib" \
     )
DEBUGFILEDIR=   ${DEBUGDIR}${BINDIR}
.else
DEBUGFILEDIR?=  ${BINDIR}/.debug
.endif

presumably the affected test here is the first case that installs a test .so other than under /usr/tests/lib/....

If we assume any .so under /usr/tests is a base system component I'd suggest just removing (tests/)? from the existing expression and adding ${SHLIBDIR:C%/usr/tests(/.*)?%/usr/tests%} == "/usr/tests"

In D48796#1113489, @emaste wrote:

bsd.prog.mk has:

# Use ${DEBUGDIR} for base system debug files, else .debug subdirectory
.if defined(BINDIR) && (\
    ${BINDIR} == "/bin" ||\
    ${BINDIR:C%/libexec(/.*)?%/libexec%} == "/libexec" ||\
    ${BINDIR} == "/sbin" ||\
    ${BINDIR:C%/usr/(bin|bsdinstall|libexec|lpr|sendmail|sm.bin|sbin|tests)(/.*)?%/usr/bin%} == "/usr/bin" ||\
    ${BINDIR} == "/usr/lib" \
     )
DEBUGFILEDIR=   ${DEBUGDIR}${BINDIR}
.else
DEBUGFILEDIR?=  ${BINDIR}/.debug
.endif

presumably the affected test here is the first case that installs a test .so other than under /usr/tests/lib/....

Yes, so far it is the only one. libsoxstack.so required by tests/sys/vm/stack/stack_dlopen_exec_test.c

If we assume any .so under /usr/tests is a base system component I'd suggest just removing (tests/)? from the existing expression and adding ${SHLIBDIR:C%/usr/tests(/.*)?%/usr/tests%} == "/usr/tests"

That works as well... Will do. Thank you!

Address suggestions.

Harbormaster completed remote builds in B62234: Diff 150448.Feb 4 2025, 3:12 AM

emaste added inline comments.Feb 4 2025, 2:23 PM