Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 19 Dec 2023 16:24:08 GMT
From:      Kristof Provost <kp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: ec6682ed6c1d - main - atf.test: fix installation of python test scripts
Message-ID:  <202312191624.3BJGO8wt015058@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by kp:

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

commit ec6682ed6c1d7304521bad39a1ad7ceae76aaca3
Author:     Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2023-12-19 13:15:48 +0000
Commit:     Kristof Provost <kp@FreeBSD.org>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202312191624.3BJGO8wt015058>