From nobody Sun Oct 22 17:19:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SD4ms5SJtz4xZrV; Sun, 22 Oct 2023 17:19:09 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qv1-xf29.google.com (mail-qv1-xf29.google.com [IPv6:2607:f8b0:4864:20::f29]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SD4mr6nq2z4dGF; Sun, 22 Oct 2023 17:19:08 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qv1-xf29.google.com with SMTP id 6a1803df08f44-66cfef11a25so14164736d6.3; Sun, 22 Oct 2023 10:19:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697995147; x=1698599947; darn=freebsd.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:from:to:cc:subject:date:message-id :reply-to; bh=DFx1JS0TAOEFkvo9S+C5kK7kce+ncRqruM3Rn4EU3a0=; b=icSL06yhnrP9Qomk9G+SH5zCCi3yGJjlJGK9t9kcXPIYm3vLOmvTvXNxT3U7teJWw5 HVagZt0R0SbYIHpw3Gghx8nQmtCHJuDRqSN0hGa1cJizc0ESta+8MnWrGi96lG8hFz6/ l4kl/2jceH1dai/Tu2Bk1ysIn9vGey1Y4QnLMOaw+Z4ePdrhegAqPHDlf4Ml6jlLqqu4 d0xTXT2oyyxpQvNypvliWF+BfDDuSG0lnGZq5sKAg6rAhY3pkl5BuOTsX+EfT6S9XZr9 shiyhdrJYrn2PsU/fe/FwNIb/hhWQrDYmw2jyvwvrbnrmssgf9mSiseXtSLgiLLX6Zuu q7Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697995147; x=1698599947; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DFx1JS0TAOEFkvo9S+C5kK7kce+ncRqruM3Rn4EU3a0=; b=iZym5gfOClpPNYcUV+8T4HOYL8iKvdO5pBbiROHd0PK30txhlMi1nSxupEe8HI66j3 +P7qaPx268BJ4ru4bOjx9rKqhkFOpt7JiZ2/FtTyTGGIlzFUUJbJMnC9KfF3JNL9XI9c FQ8bZKlwrBnV6aw/1wkiJHfdpUQQrXUexvQ8hMnIlXp4RWYUGrmM3+jYfPVTcsZmptY1 IBrwJZ6bZXWSdRJgAFHLPGGoY/K5MTPKr0sbcpKxgcT7hNdrdOohhhtI2fvZ+ue/iHxP A+inixT9dy2W31846WyNjMym+0Bpucv98wnh87LFQDfWYisNCoecP6VyGriCa0cnx0PV jM0g== X-Gm-Message-State: AOJu0YwFh2CV6uh8rruCcbWzvntcBBPaqMwmUOfIGtWAon762qOop8NX bebFsk3ak5fTvPkCIGUwGBVf6bx2rrg= X-Google-Smtp-Source: AGHT+IEktmujZCf/dPdw4/kKFSy9tGyrqSlXEXGXx0EQ28HUx0WdxJo/C4lxv1CK4IzRKb1xDKccNg== X-Received: by 2002:a05:6214:250a:b0:65d:56c:5177 with SMTP id gf10-20020a056214250a00b0065d056c5177mr7463970qvb.57.1697995147139; Sun, 22 Oct 2023 10:19:07 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id dj19-20020a056214091300b0065af71585b5sm2308355qvb.58.2023.10.22.10.19.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 10:19:06 -0700 (PDT) Date: Sun, 22 Oct 2023 13:19:04 -0400 From: Mark Johnston To: Dimitry Andric Cc: Gleb Smirnoff , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 6120673f7566 - main - tests: fix ATF_TESTS_PYTEST no clean build Message-ID: References: <202310201747.39KHlUgB005433@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4SD4mr6nq2z4dGF On Sat, Oct 21, 2023 at 09:07:26PM +0200, Dimitry Andric wrote: > On 20 Oct 2023, at 19:47, Gleb Smirnoff wrote: > > > > The branch main has been updated by glebius: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=6120673f7566c35023921540d2d682572d1bf1ce > > > > commit 6120673f7566c35023921540d2d682572d1bf1ce > > Author: Gleb Smirnoff > > AuthorDate: 2023-10-20 17:47:08 +0000 > > Commit: Gleb Smirnoff > > 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 ..." to update what will be committed) > (use "git restore ..." 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.