Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/regress/sys Remove bpf regress tests, obsoleted by ATF net/b...
details: https://anonhg.NetBSD.org/src/rev/f202d852d747
branches: trunk
changeset: 353600:f202d852d747
user: kamil <kamil%NetBSD.org@localhost>
date: Sun May 14 03:50:42 2017 +0000
description:
Remove bpf regress tests, obsoleted by ATF net/bpf and rump
diffstat:
regress/sys/Makefile | 4 +-
regress/sys/net/Makefile | 7 -
regress/sys/net/bpf/Makefile | 7 -
regress/sys/net/bpf/interface/Makefile | 15 --
regress/sys/net/bpf/interface/interface.c | 109 ---------------------
regress/sys/net/bpf/out-of-bounds/Makefile | 13 --
regress/sys/net/bpf/out-of-bounds/out-of-bounds.sh | 28 -----
7 files changed, 2 insertions(+), 181 deletions(-)
diffs (217 lines):
diff -r fc918509d13d -r f202d852d747 regress/sys/Makefile
--- a/regress/sys/Makefile Sun May 14 03:42:42 2017 +0000
+++ b/regress/sys/Makefile Sun May 14 03:50:42 2017 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2017/05/14 03:42:42 kamil Exp $
+# $NetBSD: Makefile,v 1.14 2017/05/14 03:50:42 kamil Exp $
.include <bsd.own.mk>
-SUBDIR= kern fs uvm net
+SUBDIR= kern fs uvm
.if exists(arch/${MACHINE}/Makefile)
SUBDIR+= arch/${MACHINE}
.endif
diff -r fc918509d13d -r f202d852d747 regress/sys/net/Makefile
--- a/regress/sys/net/Makefile Sun May 14 03:42:42 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2011/11/01 23:07:34 pgoyette Exp $
-
-.include <bsd.own.mk>
-
-SUBDIR= bpf
-
-.include <bsd.subdir.mk>
diff -r fc918509d13d -r f202d852d747 regress/sys/net/bpf/Makefile
--- a/regress/sys/net/bpf/Makefile Sun May 14 03:42:42 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2006/03/24 13:54:58 pavel Exp $
-
-.include <bsd.own.mk>
-
-SUBDIR= interface out-of-bounds
-
-.include <bsd.subdir.mk>
diff -r fc918509d13d -r f202d852d747 regress/sys/net/bpf/interface/Makefile
--- a/regress/sys/net/bpf/interface/Makefile Sun May 14 03:42:42 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2005/12/25 22:07:01 rpaulo Exp $
-
-NOMAN= # defined
-
-PROG= interface
-WARNS= 3
-
-regress:
- @if ./${PROG} ; then \
- echo "PASSED"; \
- else \
- echo "FAILED"; \
- fi
-
-.include <bsd.prog.mk>
diff -r fc918509d13d -r f202d852d747 regress/sys/net/bpf/interface/interface.c
--- a/regress/sys/net/bpf/interface/interface.c Sun May 14 03:42:42 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-/* $NetBSD: interface.c,v 1.2 2008/04/28 20:23:07 martin Exp $ */
-
-/*
- * Copyright (c) 2005 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Rui Paulo.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <errno.h>
-#include <string.h>
-#include <err.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/ioctl.h>
-
-#include <net/bpf.h>
-#include <net/if.h>
-
-int
-main(int argc, char *argv[])
-{
- int fd,i ;
- u_int testint;
- struct bpf_dltlist testdlt;
- struct bpf_program testprog;
- struct bpf_stat teststat;
- struct bpf_version testversion;
- struct ifreq testif;
- struct timeval testtv;
-
- struct ioctls_lists {
- unsigned long req;
- void *argumentp;
- } ioctls[] = {
- { BIOCGBLEN, &testint },
- { BIOCGDLT, &testint },
- { BIOCGDLTLIST, &testdlt },
- { BIOCFLUSH, NULL },
- { BIOCPROMISC, NULL },
- { BIOCGETIF, &testif },
- { BIOCGRTIMEOUT, &testtv },
- { BIOCGSTATS, &teststat },
- { BIOCIMMEDIATE, &testint },
- { BIOCSETF, &testprog },
- { BIOCVERSION, &testversion },
- { BIOCGHDRCMPLT, &testint },
- { BIOCGSEESENT, &testint },
- { -1, NULL }
- };
- int nfailed;
-
- fd = open("/dev/bpf", O_RDWR, 0);
- if (fd < 0)
- err(EXIT_FAILURE, "/dev/bpf");
-
- strcpy(testif.ifr_name, "lo0");
- nfailed = 0;
-
- /* set no filter or remove the filter */
- testprog.bf_len = 0;
- testprog.bf_insns = NULL;
-
- if (ioctl(fd, BIOCSETIF, &testif) < 0)
- err(EXIT_FAILURE, "lo0");
-
- for (i = 0; ioctls[i].req != -1; i++)
- if (ioctl(fd, ioctls[i].req, ioctls[i].argumentp) < 0) {
- fprintf(stderr, "0x%lx:\tFAILED (%s)\n",
- ioctls[i].req, strerror(errno));
- switch (ioctls[i].req) {
- case BIOCGDLTLIST:
- case BIOCPROMISC:
- /* both should fail on lo0 */
- break;
- default:
- nfailed++;
- }
- } else
- printf("0x%lx:\tOK\n", ioctls[i].req);
-
- return nfailed;
-}
diff -r fc918509d13d -r f202d852d747 regress/sys/net/bpf/out-of-bounds/Makefile
--- a/regress/sys/net/bpf/out-of-bounds/Makefile Sun May 14 03:42:42 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2006/03/24 13:54:58 pavel Exp $
-
-.ifdef REGRESS_LOG
-regress:
- @echo sys/net/bpf/out-of-bounds out-of-bounds \
- `./out-of-bounds.sh` | tee ${REGRESS_LOG} ; true
-.else
-regress:
- @echo sys/net/bpf/out-of-bounds out-of-bounds \
- `./out-of-bounds.sh`; true
-.endif
-
-.include <bsd.prog.mk>
diff -r fc918509d13d -r f202d852d747 regress/sys/net/bpf/out-of-bounds/out-of-bounds.sh
--- a/regress/sys/net/bpf/out-of-bounds/out-of-bounds.sh Sun May 14 03:42:42 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-# an out-of-bounds read in the BPF expression should exit the bpf program,
-# regardless of other expressions. Pass an expression to tcpdump which
-# performs an out-of-bound read and ping with a packet which would cause
-# the expression to succeed if the out-of-bounds read is not handled.
-
-# exit status: 0 - pass, 1 - fail, 2 - skip
-
-IFACE=${IFACE:-lo0}
-ADDR=${ADDR:-127.0.0.1}
-
-tcpdump -c1 -np -i $IFACE \( link[34000:2]=0 or icmp \) and ip[36:2]=0xcafe > /dev/null &
-TCPDUMP_PID=$!
-
-sleep 1
-if ! kill -0 $TCPDUMP_PID > /dev/null 2>&1 ; then
- echo "SKIPPED tcpdump exited - are you root?"; exit 2;
-fi
-if ! ping -c1 -p cafe $ADDR > /dev/null 2>&1 ; then
- echo "SKIPPED not able to ping localhost";
- kill $TCPDUMP_PID > /dev/null 2>&1 ; exit 2;
-fi
-sleep 2
-if ! kill $TCPDUMP_PID > /dev/null 2>&1; then
- echo "FAILED"; exit 1;
-fi
-wait $TCPDUMP_PID; echo "PASSED"; exit 0;
Home |
Main Index |
Thread Index |
Old Index