Re: git: 6120673f7566 - main - tests: fix ATF_TESTS_PYTEST no clean build
- In reply to: Dimitry Andric : "Re: git: 6120673f7566 - main - tests: fix ATF_TESTS_PYTEST no clean build"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 22 Oct 2023 17:19:04 UTC
On Sat, Oct 21, 2023 at 09:07:26PM +0200, Dimitry Andric wrote:
> On 20 Oct 2023, at 19:47, Gleb Smirnoff <glebius@FreeBSD.org> wrote:
> >
> > The branch main has been updated by glebius:
> >
> > URL: https://cgit.FreeBSD.org/src/commit/?id=6120673f7566c35023921540d2d682572d1bf1ce
> >
> > commit 6120673f7566c35023921540d2d682572d1bf1ce
> > Author: Gleb Smirnoff <glebius@FreeBSD.org>
> > AuthorDate: 2023-10-20 17:47:08 +0000
> > Commit: Gleb Smirnoff <glebius@FreeBSD.org>
> > CommitDate: 2023-10-20 17:47:08 +0000
> >
> > tests: fix ATF_TESTS_PYTEST no clean build
> >
> > The hack with .xtmp file was effectively making the make to
> > ignore changes to the sources, breaking NO_CLEAN builds. The
> > hack can be actually omitted as setting SCRIPTSNAME_${_T} for
> > every test is sufficient to prevent renaming by bsd.prog.mk.
> >
> > Reviewed by: melifaro
> > Differential Revision: https://reviews.freebsd.org/D42283
>
> This appears to break clean builds, in that it now deletes files
> mentioned in ATF_TESTS_PYTEST in the _source_ directories, leaving your
> git checkout looking as follows:
>
> Changes not staged for commit:
> (use "git add/rm <file>..." to update what will be committed)
> (use "git restore <file>..." to discard changes in working directory)
> deleted: sbin/ping/tests/test_ping.py
> deleted: tests/examples/test_examples.py
> deleted: tests/examples/test_ktest_example.py
> deleted: tests/sys/net/routing/test_routing_l3.py
> deleted: tests/sys/net/routing/test_rtsock_multipath.py
> deleted: tests/sys/netinet/carp.py
> deleted: tests/sys/netinet6/test_ip6_output.py
> deleted: tests/sys/netlink/test_netlink_message_writer.py
> deleted: tests/sys/netlink/test_nl_core.py
> deleted: tests/sys/netlink/test_rtnl_iface.py
> deleted: tests/sys/netlink/test_rtnl_ifaddr.py
> deleted: tests/sys/netlink/test_rtnl_neigh.py
> deleted: tests/sys/netlink/test_rtnl_route.py
> deleted: tests/sys/netpfil/pf/frag6.py
> deleted: tests/sys/netpfil/pf/sctp.py
>
> Then of course when buildworld arrives at the point where the tests are
> built, it errors out with "don't know how to make
> sbin/ping/tests/test_ping.py", and similar.
>
> Do you mind if I revert this for now?
I went ahead and reverted the commit since this problem is biting me
too in some cases.