Bug 249144 - pkgbase: /usr/tests/ subdirectories in non -dev/-dbg plist files
Summary: pkgbase: /usr/tests/ subdirectories in non -dev/-dbg plist files
Status: Closed FIXED
Alias: None
Product: Base System
Classification: Unclassified
Component: misc (show other bugs)
Version: CURRENT
Hardware: Any Any
: --- Affects Some People
Assignee: Ed Maste
URL:
Keywords: pkgbase
Depends on:
Blocks:
 
Reported: 2020-09-06 08:36 UTC by Martin
Modified: 2025-02-27 19:46 UTC (History)
5 users (show)

See Also:
linimon: mfc-stable14?
linimon: mfc-stable13?


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Martin 2020-09-06 08:36:31 UTC
There are a lot of subdirectories of /usr/tests/ and some files in non dev/dbg plist files, mainly in utilities.plist, which should go to the -dev/-dbg plist or the tests.plist file(s).

Just the files:

ssh.plist:@(root,wheel,0444,) /usr/tests/secure/libexec/Kyuafile
utilities.plist:@(root,wheel,0444,) /usr/tests/lib/csu/dynamiclib//libh_csu.so
utilities.plist:@(root,wheel,0444,) /usr/tests/lib/libc/stdlib/dynthr_mod.so
utilities.plist:@(root,wheel,0444,) /usr/tests/lib/libc/tls/h_tls_dlopen.so
utilities.plist:@(root,wheel,0444,) /usr/tests/lib/libc/tls/libh_tls_dynamic.so.1
utilities.plist:@(root,wheel,0755,) /usr/tests/lib/libthr/dlopen/h_pthread_dlopen.so
utilities.plist:@(root,wheel,0444,) /usr/tests/lib/libthr/dlopen/h_pthread_dlopen.so.1
utilities.plist:@(root,wheel,0444,) /usr/tests/lib/libxo/libenc_test.so
utilities.plist:@(root,wheel,0444,) /usr/tests/libexec/rtld-elf/libpythagoras.so.0
utilities.plist:@(root,wheel,0555,) /usr/tests/libexec/rtld-elf/target

here are some directories:
...
utilities.plist:@dir(root,wheel,0755,) /usr/tests
utilities.plist:@dir(root,wheel,0755,) /usr/tests/bin
utilities.plist:@dir(root,wheel,0755,) /usr/tests/bin/cat
utilities.plist:@dir(root,wheel,0755,) /usr/tests/bin/chflags
utilities.plist:@dir(root,wheel,0755,) /usr/tests/bin/chmod
utilities.plist:@dir(root,wheel,0755,) /usr/tests/bin/date
utilities.plist:@dir(root,wheel,0755,) /usr/tests/bin/dd
utilities.plist:@dir(root,wheel,0755,) /usr/tests/bin/echo
utilities.plist:@dir(root,wheel,0755,) /usr/tests/bin/expr
utilities.plist:@dir(root,wheel,0755,) /usr/tests/bin/ln
utilities.plist:@dir(root,wheel,0755,) /usr/tests/bin/ls
utilities.plist:@dir(root,wheel,0755,) /usr/tests/bin/mkdir
utilities.plist:@dir(root,wheel,0755,) /usr/tests/bin/mv
utilities.plist:@dir(root,wheel,0755,) /usr/tests/bin/pax
...
Comment 1 Martin 2023-09-17 07:02:52 UTC
There seems to be some reshuffling of files to a correct/better fitting pkg going on, so i want to try to get some attention to this ticket.

On my 14.0-STABLE system, i would say these files are added to the wrong pkg:

bsnmp.plist:@dir(root,wheel,0755,)      /usr/tests/lib/libbsnmp
bsnmp.plist:@(root,wheel,0444,)         /usr/tests/lib/libbsnmp/Kyuafile
bsnmp.plist:@(root,wheel,0555,)         /usr/tests/lib/libbsnmp/bsnmpd_test
ssh.plist:@dir(root,wheel,0755,)        /usr/tests/secure/libexec
ssh.plist:@(root,wheel,0444,)           /usr/tests/secure/libexec/Kyuafile
utilities.plist:@dir(root,wheel,0755,)  /usr/tests/atf_python
utilities.plist:@(root,wheel,0444,)     /usr/tests/atf_python/__init__.py
utilities.plist:@(root,wheel,0444,)     /usr/tests/atf_python/atf_pytest.py
utilities.plist:@(root,wheel,0444,)     /usr/tests/atf_python/ktest.py
utilities.plist:@dir(root,wheel,0755,)  /usr/tests/atf_python/sys
utilities.plist:@(root,wheel,0444,)     /usr/tests/atf_python/sys/__init__.py
utilities.plist:@dir(root,wheel,0755,)  /usr/tests/atf_python/sys/net
utilities.plist:@(root,wheel,0444,)     /usr/tests/atf_python/sys/net/__init__.py
utilities.plist:@(root,wheel,0444,)     /usr/tests/atf_python/sys/net/rtsock.py
utilities.plist:@(root,wheel,0444,)     /usr/tests/atf_python/sys/net/tools.py
utilities.plist:@(root,wheel,0444,)     /usr/tests/atf_python/sys/net/vnet.py
utilities.plist:@dir(root,wheel,0755,)  /usr/tests/atf_python/sys/netlink
utilities.plist:@(root,wheel,0444,)     /usr/tests/atf_python/sys/netlink/__init__.py
utilities.plist:@(root,wheel,0444,)     /usr/tests/atf_python/sys/netlink/attrs.py
utilities.plist:@(root,wheel,0444,)     /usr/tests/atf_python/sys/netlink/base_headers.py
utilities.plist:@(root,wheel,0444,)     /usr/tests/atf_python/sys/netlink/message.py
utilities.plist:@(root,wheel,0444,)     /usr/tests/atf_python/sys/netlink/netlink.py
utilities.plist:@(root,wheel,0444,)     /usr/tests/atf_python/sys/netlink/netlink_generic.py
utilities.plist:@(root,wheel,0444,)     /usr/tests/atf_python/sys/netlink/netlink_route.py
utilities.plist:@(root,wheel,0444,)     /usr/tests/atf_python/sys/netlink/utils.py
utilities.plist:@dir(root,wheel,0755,)  /usr/tests/atf_python/sys/netpfil
utilities.plist:@(root,wheel,0444,)     /usr/tests/atf_python/sys/netpfil/__init__.py
utilities.plist:@dir(root,wheel,0755,)  /usr/tests/atf_python/sys/netpfil/ipfw
utilities.plist:@(root,wheel,0444,)     /usr/tests/atf_python/sys/netpfil/ipfw/__init__.py
utilities.plist:@(root,wheel,0444,)     /usr/tests/atf_python/sys/netpfil/ipfw/insn_headers.py
utilities.plist:@(root,wheel,0444,)     /usr/tests/atf_python/sys/netpfil/ipfw/insns.py
utilities.plist:@(root,wheel,0444,)     /usr/tests/atf_python/sys/netpfil/ipfw/ioctl.py
utilities.plist:@(root,wheel,0444,)     /usr/tests/atf_python/sys/netpfil/ipfw/ioctl_headers.py
utilities.plist:@(root,wheel,0444,)     /usr/tests/atf_python/sys/netpfil/ipfw/ipfw.py
utilities.plist:@(root,wheel,0444,)     /usr/tests/atf_python/sys/netpfil/ipfw/utils.py
utilities.plist:@(root,wheel,0444,)     /usr/tests/atf_python/utils.py
utilities.plist:@(root,wheel,0444,)     /usr/tests/lib/csu/dynamiclib//libh_csu.so
utilities.plist:@(root,wheel,0444,)     /usr/tests/lib/libc/stdlib/dynthr_mod.so
utilities.plist:@(root,wheel,0444,)     /usr/tests/lib/libc/tls/h_tls_dlopen.so
utilities.plist:@(root,wheel,0444,)     /usr/tests/lib/libc/tls/libh_tls_dynamic.so.1
utilities.plist:@(root,wheel,0755,)     /usr/tests/lib/libthr/dlopen/h_pthread_dlopen.so
utilities.plist:@(root,wheel,0444,)     /usr/tests/lib/libthr/dlopen/h_pthread_dlopen.so.1
utilities.plist:@(root,wheel,0444,)     /usr/tests/libexec/rtld-elf/libpythagoras.so.0
utilities.plist:@(root,wheel,0555,)     /usr/tests/libexec/rtld-elf/target
utilities.plist:@dir(root,wheel,0755,)  /usr/tests/sbin/pfctl/files
utilities.plist:@(root,wheel,0444,)     /usr/tests/sys/vm/stack/libsoxstack.so
Comment 2 Isaac Freund 2024-10-08 08:50:19 UTC
The /usr/tests/atf_python/ files are now correctly placed in tests.plist.

The remaining misplaced tests I've identified are as follows:

# rg '/usr/tests' -g '*.plist' --iglob "!*-dev.plist" --iglob '!*-dbg.plist' --iglob '!tests.plist'

bsnmp.plist
82:@dir(root,wheel,0755,) /usr/tests/lib/libbsnmp
83:@(root,wheel,0444,) /usr/tests/lib/libbsnmp/Kyuafile
84:@(root,wheel,0555,) /usr/tests/lib/libbsnmp/bsnmpd_test

ssh.plist
24:@dir(root,wheel,0755,) /usr/tests/secure/libexec
25:@(root,wheel,0444,) /usr/tests/secure/libexec/Kyuafile

utilities.plist
2179:@(root,wheel,0444,) /usr/tests/lib/csu/dynamiclib//libh_csu.so
2180:@(root,wheel,0755,) /usr/tests/lib/libthr/dlopen/h_pthread_dlopen.so
2181:@(root,wheel,0444,) /usr/tests/lib/libthr/dlopen/h_pthread_dlopen.so.1
2182:@dir(root,wheel,0755,) /usr/tests/sbin/pfctl/files
2183:@(root,wheel,0444,) /usr/tests/sys/vm/stack/libsoxstack.so

I'll look in to fixing this.
Comment 3 commit-hook freebsd_committer freebsd_triage 2024-12-23 22:04:14 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/src/commit/?id=3a56015a2f5d630910177fa79a522bb95511ccf7

commit 3a56015a2f5d630910177fa79a522bb95511ccf7
Author:     Isaac Freund <ifreund@freebsdfoundation.org>
AuthorDate: 2024-12-23 21:54:29 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-12-23 22:03:30 +0000

    pkgbase: fix inclusion of tests in ssh, bsnmp, clibs-dev

    Currently, files that belong in the tests package are included in the
    ssh, bsnmp, and clibs-dev packages:

    ssh.plist
    24:@dir(root,wheel,0755,) /usr/tests/secure/libexec
    25:@(root,wheel,0444,) /usr/tests/secure/libexec/Kyuafile

    bsnmp.plist
    82:@dir(root,wheel,0755,) /usr/tests/lib/libbsnmp
    83:@(root,wheel,0444,) /usr/tests/lib/libbsnmp/Kyuafile
    84:@(root,wheel,0555,) /usr/tests/lib/libbsnmp/bsnmpd_test

    clibs-dev.plist
    2518:@dir(root,wheel,0755,) /usr/tests/lib/csu
    2519:@(root,wheel,0444,) /usr/tests/lib/csu/Kyuafile

    This is caused by the PACKAGE=foo assignment in foo/Makefile.inc which
    overrides the default PACKAGE?=tests in bsd.test.mk.

    To fix this, instead use PACKAGE?=foo in foo/Makefile.inc and set
    PACKAGE=tests in foo/tests/Makefile.

    PR:             249144
    Reviewed by:    bapt, emaste
    Sponsored by:   The FreeBSD Foundation
    Differential Revision: https://reviews.freebsd.org/D47025

 lib/csu/Makefile.inc          | 2 +-
 lib/csu/tests/Makefile        | 2 ++
 lib/libbsnmp/Makefile.inc     | 2 +-
 lib/libbsnmp/tests/Makefile   | 2 ++
 secure/libexec/Makefile.inc   | 2 +-
 secure/libexec/tests/Makefile | 1 +
 6 files changed, 8 insertions(+), 3 deletions(-)
Comment 4 Mark Linimon freebsd_committer freebsd_triage 2025-02-14 14:39:49 UTC
^Triage: assign to committer that resolved.  Set MFC? flags if possible interest.
Comment 5 commit-hook freebsd_committer freebsd_triage 2025-02-27 19:46:48 UTC
A commit in branch stable/14 references this bug:

URL: https://cgit.FreeBSD.org/src/commit/?id=f183965bb8f5cf68edbd60a7c39e20ad211d6bd5

commit f183965bb8f5cf68edbd60a7c39e20ad211d6bd5
Author:     Isaac Freund <ifreund@freebsdfoundation.org>
AuthorDate: 2024-12-23 21:54:29 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2025-02-27 19:45:40 +0000

    pkgbase: fix inclusion of tests in ssh, bsnmp, clibs-dev

    Currently, files that belong in the tests package are included in the
    ssh, bsnmp, and clibs-dev packages:

    ssh.plist
    24:@dir(root,wheel,0755,) /usr/tests/secure/libexec
    25:@(root,wheel,0444,) /usr/tests/secure/libexec/Kyuafile

    bsnmp.plist
    82:@dir(root,wheel,0755,) /usr/tests/lib/libbsnmp
    83:@(root,wheel,0444,) /usr/tests/lib/libbsnmp/Kyuafile
    84:@(root,wheel,0555,) /usr/tests/lib/libbsnmp/bsnmpd_test

    clibs-dev.plist
    2518:@dir(root,wheel,0755,) /usr/tests/lib/csu
    2519:@(root,wheel,0444,) /usr/tests/lib/csu/Kyuafile

    This is caused by the PACKAGE=foo assignment in foo/Makefile.inc which
    overrides the default PACKAGE?=tests in bsd.test.mk.

    To fix this, instead use PACKAGE?=foo in foo/Makefile.inc and set
    PACKAGE=tests in foo/tests/Makefile.

    PR:             249144
    Reviewed by:    bapt, emaste
    Sponsored by:   The FreeBSD Foundation
    Differential Revision: https://reviews.freebsd.org/D47025

    (cherry picked from commit 3a56015a2f5d630910177fa79a522bb95511ccf7)

 lib/csu/Makefile.inc          | 2 +-
 lib/csu/tests/Makefile        | 1 +
 lib/libbsnmp/Makefile.inc     | 2 +-
 lib/libbsnmp/tests/Makefile   | 2 ++
 secure/libexec/Makefile.inc   | 2 +-
 secure/libexec/tests/Makefile | 1 +
 6 files changed, 7 insertions(+), 3 deletions(-)