From nobody Tue Dec 19 16:24:08 2023 X-Original-To: dev-commits-src-all@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 4Svhpd42Tfz54VqQ; Tue, 19 Dec 2023 16:24:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Svhpc6KW9z3Mfm; Tue, 19 Dec 2023 16:24:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703003048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DxrLZ6qfDYi3XsXVOxEOHt6a1V2N6eYoqAlsJq7jDnk=; b=HxnrRvD7Ue4G3+S0jIGBkrJqBMucHXjWz2BtSk9vL/Dn+6EGr1lNqKII5IPd6LoG+TkJHF n18RG7oyeIdH1AiBb0gDI28O5udy7q+T9l8EQd22XzkOSeR+GtEa+SaBiRF0lZtaEXF2yi RmdOoxyY58NmNcwyY4x3a/R6HgGccyKtBqmbTto+sOBNXkvfGaJ8p9UVQEpLLZXvV44xy8 vjoZsb51t1D7+snaA1+HjQbLsdtzq3nb7fgVKRLES6y2XbNzKuancLBM9aXvCrxlp1HRUW MeZg/Yf5EQNclhNXoJCeDe3pqVcN1+fUlQV6yT11PLVyc6A6TYqdnw5wZLWmug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703003048; a=rsa-sha256; cv=none; b=j8DRv/nMD+ae8Zk05N8cUGAhWympWMXE/wxpXC0wXC0cR6J5NrFrWMrdX+LZ3YR4P67blS NJMgS+11LYAtYS4dlTEbsKeiqVP0jFPJkTYxud3LTrQfI02+/7xVb5m07feGun9NyV8wzu /8RRZNxh1vtWf3wVCiMWBZYMNf4c6QQQ3ksswTexdkAg1Q4LQo/kiH+s2/pGbcnW8QCIeY k0Q5GZ55/yNAFlX1c7XgSJSPN7vBbBbKLARZy1cGk33/z4tjUIuFEnE4aAtcSOUzVch8bL ClkT2aows18QeomKbWqPMY+q+XwKVr6imgw7BXn2Ud57IHLXVNgCI/6FZ9xbHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703003048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DxrLZ6qfDYi3XsXVOxEOHt6a1V2N6eYoqAlsJq7jDnk=; b=XCv2+J3S60wCCN3G3/SbSB6cf37gbKwHYAa4emwsUm/B3xbgU422tOpHlsGhsAy4keIOIO HdsHDkxgrkeUqxcp86MT7YbcLsPQLyrV0MZogWJ6IUqMy0r/sveBMseWTAlmEJBGxuwDlK LZ79PxX5oAZ0W5iGbCdw0OCQxszTRaFG5/AMTRIRs0Qb6NSJVfi8Bw37ACc+UTE2W/VeZ0 S0gXLFPk+1zWSF0xjOKIftm0zMwSYTOC//gnBZQ9QL1SrZWrXhzYluoQuz2SQtLWNQ70EX BcK1axVdyU3Vx3yVwD+Cl8/chsLXpAVCHYfgsXMZV8Iz3KfSU9u73eT6O15acQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Svhpc571kz1BlV; Tue, 19 Dec 2023 16:24:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BJGO8To015061; Tue, 19 Dec 2023 16:24:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BJGO8wt015058; Tue, 19 Dec 2023 16:24:08 GMT (envelope-from git) Date: Tue, 19 Dec 2023 16:24:08 GMT Message-Id: <202312191624.3BJGO8wt015058@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: ec6682ed6c1d - main - atf.test: fix installation of python test scripts List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec6682ed6c1d7304521bad39a1ad7ceae76aaca3 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ec6682ed6c1d7304521bad39a1ad7ceae76aaca3 commit ec6682ed6c1d7304521bad39a1ad7ceae76aaca3 Author: Kristof Provost AuthorDate: 2023-12-19 13:15:48 +0000 Commit: Kristof Provost CommitDate: 2023-12-19 16:23:54 +0000 atf.test: fix installation of python test scripts Python test scripts get processed (to add the `#! /usr/libexec/ atf_pytest_wrapper` shebang line), into a .xtmp file, and installed from there. However, as there was no dependency of this .xtmp file on the original file we kept reinstalling the .xtmp file, even if the original had been edited already. This could cause great confusion when debugging python test scripts. Reviewed by: markj Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D43118 --- share/mk/atf.test.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/atf.test.mk b/share/mk/atf.test.mk index 4b8ac8dedc27..f7696641ffb0 100644 --- a/share/mk/atf.test.mk +++ b/share/mk/atf.test.mk @@ -143,7 +143,7 @@ CLEANFILES+= ${_T} ${_T}.tmp # this proves to be useful within the tests. ATF_TESTS_PYTEST_SED_${_T}?= # empty ATF_TESTS_PYTEST_SRC_${_T}?= ${.CURDIR}/${_T:S,.xtmp$,,} -${_T}: +${_T}: ${_T:S/.xtmp//} echo "#! /usr/libexec/atf_pytest_wrapper -P ${TESTSBASE}" > ${.TARGET}.tmp .if empty(ATF_TESTS_PYTEST_SED_${_T}) cat ${ATF_TESTS_PYTEST_SRC_${_T}} >>${.TARGET}.tmp