system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-24 11:47:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

tests: fix ATF_TESTS_PYTEST no clean build

Browse source 
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 commit is contained in:
Gleb Smirnoff 2023-10-20 10:47:08 -07:00
parent 2b39a6f68c
commit 6120673f75
1 changed files with 5 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
share/mk/atf.test.mk
View file

@ -111,39 +111,19 @@ ${_T}: ${ATF_TESTS_KSH93_SRC_${_T}}
.endif
.if !empty(ATF_TESTS_PYTEST)
# bsd.prog.mk SCRIPTS interface removes file extension unless
# SCRIPTSNAME is set, which is not possible to do here.
# Workaround this by appending another extension (.xtmp) to the
# file name. Use separate loop to avoid dealing with explicitly
# stating expansion for each and every variable.
#
# ATF_TESTS_PYTEST -> contains list of files as is (test_something.py ..)
# _ATF_TESTS_PYTEST -> (test_something.py.xtmp ..)
#
# Former array is iterated to construct Kyuafile, where original file
# names need to be written.
# Latter array is iterated to enable bsd.prog.mk scripts framework -
# namely, installing scripts without .xtmp prefix. Note: this allows to
# not bother about the fact that make target needs to be different from
# the source file.
_TESTS+= ${ATF_TESTS_PYTEST}
_ATF_TESTS_PYTEST=
SCRIPTS+= ${ATF_TESTS_PYTEST}
.for _T in ${ATF_TESTS_PYTEST}
_ATF_TESTS_PYTEST += ${_T}.xtmp
SCRIPTSDIR_${_T}= ${TESTSDIR}
SCRIPTSNAME_${_T}= ${_T}
TEST_INTERFACE.${_T}= atf
TEST_METADATA.${_T}+= required_programs="pytest"
.endfor
SCRIPTS+= ${_ATF_TESTS_PYTEST}
.for _T in ${_ATF_TESTS_PYTEST}
SCRIPTSDIR_${_T}= ${TESTSDIR}
CLEANFILES+= ${_T} ${_T}.tmp
# TODO(jmmv): It seems to me that this SED and SRC functionality should
# exist in bsd.prog.mk along the support for SCRIPTS. Move it there if
# this proves to be useful within the tests.
ATF_TESTS_PYTEST_SED_${_T}?= # empty
ATF_TESTS_PYTEST_SRC_${_T}?= ${.CURDIR}/${_T:S,.xtmp$,,}
${_T}:
ATF_TESTS_PYTEST_SRC_${_T}?= ${.CURDIR}/${_T}
${_T}: ${.CURDIR}/${_T}
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