d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove some hacks from regression test since bpf_filter.c builds fine now.

Browse Source
This commit is contained in:
jkim 2008-08-26 00:35:04 +00:00
parent 2663616430
commit 12fb66e68a
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/regression/bpf/bpf_filter/Makefile
View File

@ -20,11 +20,13 @@ TEST_CASES= test0001 test0002 test0003 test0004 \
test0069 test0070 test0071 test0072 \
test0073 test0074
WARNS?= 6
SYSDIR?= ${.CURDIR}/../../../../sys
SRCS= ${.CURDIR}/bpf_test.c
CFLAGS+= -g -fno-builtin-abort -I${.CURDIR}/tests
CFLAGS+= -g -I${SYSDIR} -I${.CURDIR}/tests
.if defined(BPF_BENCHMARK)
CFLAGS+= -DBPF_BENCHMARK -DLOG_LEVEL=0
@ -39,11 +41,9 @@ CFLAGS+= -DBPF_VALIDATE
.if (${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386") && defined(BPF_JIT)
SRCS+= ${SYSDIR}/net/bpf_jitter.c \
${SYSDIR}/${MACHINE_ARCH}/${MACHINE_ARCH}/bpf_jit_machdep.c
CFLAGS+= -I${SYSDIR} -DBPF_JIT_COMPILER
WARNS?= 6
CFLAGS+= -DBPF_JIT_COMPILER
.else
SRCS+= ${SYSDIR}/net/bpf_filter.c
WARNS?= 1
.endif
.for TEST in ${TEST_CASES}

9
tools/regression/bpf/bpf_filter/bpf_test.c
View File

@ -52,7 +52,10 @@ __FBSDID("$FreeBSD$");
static void sig_handler(int);
#if defined(BPF_JIT_COMPILER) || defined(BPF_VALIDATE)
static int nins = sizeof(pc) / sizeof(pc[0]);
#endif
static int verbose = LOG_LEVEL;
#ifdef BPF_JIT_COMPILER
@ -86,10 +89,6 @@ bpf_compile_and_filter(void)
return (ret);
}
#else
u_int bpf_filter(struct bpf_insn *, u_char *, u_int, u_int);
#endif
#ifdef BPF_VALIDATE
@ -155,7 +154,7 @@ bpf_validate(const struct bpf_insn *f, int len)
int
main(void)
{
#if !defined(BPF_JIT_COMPILER)
#ifndef BPF_JIT_COMPILER
u_int i;
#endif
u_int ret;