diff options
| author | tls <tls@NetBSD.org> | 2014-08-10 16:44:32 +0000 |
|---|---|---|
| committer | tls <tls@NetBSD.org> | 2014-08-10 16:44:32 +0000 |
| commit | a72ef11467f430f0cb27f4e6a8ad98db3d777dd9 (patch) | |
| tree | 24f8915da45fd4b2671f09d9c1303538474ff651 /tests/kernel | |
| parent | df3948ca31a0d211dc4758be54656b813bd65bcf (diff) | |
Merge tls-earlyentropy branch into HEAD.
Diffstat (limited to 'tests/kernel')
| -rw-r--r-- | tests/kernel/Makefile | 3 | ||||
| -rwxr-xr-x | tests/kernel/gen_t_subr_prf | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/tests/kernel/Makefile b/tests/kernel/Makefile index 74f1d21d542..6a2bb907a91 100644 --- a/tests/kernel/Makefile +++ b/tests/kernel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2014/08/09 07:04:03 gson Exp $ +# $NetBSD: Makefile,v 1.36 2014/08/10 16:44:37 tls Exp $ NOMAN= # defined @@ -50,6 +50,7 @@ CPPFLAGS.subr_extent.c= -D_EXTENT_TESTING -D__POOL_EXPOSE t_subr_prf.c: gen_t_subr_prf ${NETBSDSRCDIR}/sys/kern/subr_prf.c ${HOST_SH} ${.ALLSRC} ${.TARGET} +CPPFLAGS.t_subr_prf.c= -Wno-pointer-sign # XXX platform vs kernel SHA2 CLEANFILES+= t_subr_prf.c diff --git a/tests/kernel/gen_t_subr_prf b/tests/kernel/gen_t_subr_prf index af03391e0ed..b58a6ba425d 100755 --- a/tests/kernel/gen_t_subr_prf +++ b/tests/kernel/gen_t_subr_prf @@ -2,10 +2,12 @@ cat << _EOF > $2 #include <sys/types.h> +#include <sys/time.h> #include <stdio.h> #include <stdarg.h> #include <stdint.h> #include <string.h> +#include <sha2.h> #include <atf-c.h> @@ -18,6 +20,7 @@ cat << _EOF > $2 #define KPRINTF_BUFSIZE 1024 #undef putchar #define putchar xputchar + static int putchar(char c, int foo, void *b) { return fputc(c, stderr); @@ -29,6 +32,13 @@ static const char hexdigits[] = "0123456789abcdef"; typedef int device_t; +#if 0 +static SHA512_CTX kprnd_sha; +#endif + +#define timespec timeval +#define nanotime(ts) gettimeofday(ts, NULL) + #define device_xname(a) "" int kprintf(const char *, int, void *, char *, va_list) __printflike(1, 0); void device_printf(device_t, const char *, ...) __printflike(2, 3); |
