svn commit: r315230 - in head: etc/mtree tests/sys/geom tests/sys/geom/class/eli tests/sys/geom/eli

[Allan Jude]

On 2017-03-15 01:22, Gleb Smirnoff wrote:
> On Tue, Mar 14, 2017 at 07:00:22AM +0000, Ngie Cooper wrote:
> N> Author: ngie
> N> Date: Tue Mar 14 07:00:22 2017
> N> New Revision: 315230
> N> URL: https://svnweb.freebsd.org/changeset/base/315230
> N> 
> N> Log:
> N>   Move .../sys/geom/eli/pbkdf2... to .../sys/geom/class/eli/...
> N>   
> N>   This change moves the tests added in r313962 to an existing directory
> N>   structure used by the geli TAP tests. It also, renames the test from
> N>   pbkdf2 to pbkdf2_test .
> N>   
> N>   The changes to ObsoleteFiles.inc are being committed separately as they
> N>   aren't needed for the MFC to ^/stable/11, etc, if the MFC for the tests
> N>   is done all in one commit.
> N>   
> N>   MFC after:	2 weeks
> N>   X-MFC with:	r313962, r313972-r313973
> N>   Reviewed by:	allanjude
> N>   Sponsored by:	Dell EMC Isilon
> N>   Differential Revision:	D9985
> 
> This breaks buildworld for a system that doesn't have SYSDIR defined in src.conf,
> and also doesn't have /usr/src/sys.
> 
> What happens is that include path is /sys. On some systems this is
> meaningful, on others not.
> 
> glebius at morannon:/usr/src/head/tests/sys/geom/class/eli:|>make
> (cd /usr/src/head/tests/sys/geom/class/eli &&  DEPENDFILE=.depend.pbkdf2_test  NO_SUBDIR=1 make -f /usr/src/head/tests/sys/geom/class/eli/Makefile _RECURSING_PROGS=t  PROG=pbkdf2_test )
> cc  -O2 -pipe   -I/sys -g -MD  -MF.depend.pbkdf2_test.g_eli_crypto.o -MTg_eli_crypto.o -std=gnu99 -fstack-protector-strong    -Qunused-arguments  -c /usr/src/head/sys/geom/eli/g_eli_crypto.c -o g_eli_crypto.o
> In file included from /usr/src/head/sys/geom/eli/g_eli_crypto.c:44:
> /usr/include/geom/eli/g_eli.h:35:10: fatal error: 'crypto/sha2/sha256.h' file
>       not found
> #include <crypto/sha2/sha256.h>
> 
> This also breaks buildworld.
> 

I think we also need to update the mtree files, as I get this failure @
installworld:

===> tests/sys/geom/class/eli (install)
install  -s -o root -g wheel -m 555   pbkdf2_test
/usr/tests/sys/geom/class/eli/pbkdf2_test
install: pbkdf2_test: No such file or directory
*** Error code 71

Stop.



-- 
Allan Jude

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 834 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/svn-src-head/attachments/20170316/01b31348/attachment.sig>