15.01.2023 21:30, Rafael Sadowski пишет:
> On Sun Jan 15, 2023 at 09:55:25PM +0100, Florian Viehweger wrote:
>> Hi,
>>
>> this updates fish to 3.6.0.
>>
>> 'portcheck' and 'make port-lib-depends-check' is happy, as well as some
>> runtime testing on amd64 revealed no errors.
>>
>> However all tests fail with not finding the tests directory:
>> 'Failed to change working directory to
>> /usr/ports/pobj/fish-3.6.0/build-amd64/tests'
>>
>> I talked with op@ about it off list and we haven't found a change
>> regarding tests.
>>
>> However running 'make test' with fish 3.5.1 in ports also does make all
>> tests fail. This was not the case when it was imported. Some tests did
>> fail, but not all of them.
>>
>> This is why we suspect the cmake change which went in after fish 3.5.1.
>>
>> I'm unsure how to address this and I don't want to disable tests for
>> now.
>>
>> cc rsadowski@ and op@
>>
>> Thank you for any tips!
>
> Quick solution. Looks like the test target is not part of the default
> target. I suppose cmake.mk needs target support to handle it better.
Yes, {ALL,INSTALL,TEST}_TARGET all completely ignore by devel/cmake.
Changing that is easy in the module (I've looked into this recently),
but we should probably put this through a bulk and see how ports fare
when suddenly building the special 'all' target.
Rafael, unless you have plans for this, I can send a diff soon.
>
> Cheers,
>
> Rafael
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/shells/fish/Makefile,v
> retrieving revision 1.38
> diff -u -p -u -p -r1.38 Makefile
> --- Makefile 13 Nov 2022 15:29:44 -0000 1.38
> +++ Makefile 15 Jan 2023 21:25:55 -0000
> @@ -56,4 +56,10 @@ post-install:
> mv ${PREFIX}/etc/fish/config.fish ${PREFIX}/share/examples/fish/
> rm -Rf ${PREFIX}/etc/
>
> +do-test:
> + cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} \
> + cmake --build ${WRKBUILD} ${_MAKE_VERBOSE} -j ${MAKE_JOBS} \
> + -t test
This should also work, no?
do-test:
${MODCMAKE_BUILD_TARGET} -t ${TEST_TARGET}
> +
> +
> .include <bsd.port.mk>
>
