summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2016-04-25 19:30:11 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2016-04-25 19:30:11 +0000
commiteca07a91fc84b38554a37e75caaeb9c1ca82d0d5 (patch)
tree22e73c9b498d848261fdf1a0c99d7cb3059c5636
parent8cd15ec205a1c3df270453abd15353159ddc993b (diff)
remove systrace
-rw-r--r--regress/sys/kern/pledge/generic/Makefile17
-rw-r--r--regress/sys/kern/pledge/generic/systrace.filter.in78
2 files changed, 2 insertions, 93 deletions
diff --git a/regress/sys/kern/pledge/generic/Makefile b/regress/sys/kern/pledge/generic/Makefile
index fdc206b37c9..2d71c81644d 100644
--- a/regress/sys/kern/pledge/generic/Makefile
+++ b/regress/sys/kern/pledge/generic/Makefile
@@ -1,26 +1,13 @@
-# $OpenBSD: Makefile,v 1.6 2015/11/03 11:03:10 semarie Exp $
+# $OpenBSD: Makefile,v 1.7 2016/04/25 19:30:10 tedu Exp $
PROG= generic
SRCS+= main.c manager.c test_stdio.c test_tty.c
NOMAN= yes
-CLEANFILES += systrace.filter systrace.err
-
CFLAGS+= -Wall -Werror
-REGRESS_TARGETS+= test_normal test_systrace_1 test_systrace_2
+REGRESS_TARGETS+= test_normal
test_normal: ${PROG}
./${PROG} | diff -I OpenBSD -u ${.CURDIR}/tests.out -
-test_systrace_1: ${PROG} systrace.filter
- systrace -e -a -f systrace.filter ./${PROG} | diff -I OpenBSD -u ${.CURDIR}/tests.out -
-
-test_systrace_2: ${PROG} systrace.filter
- systrace -E systrace.err -a -f systrace.filter ./${PROG} >/dev/null
- test ! -s systrace.err
-
-systrace.filter: systrace.filter.in
- sed 's,$${OBJDIR},'"$$(readlink -nf ${PWD})," ${.CURDIR}/systrace.filter.in >$@.tmp
- mv $@.tmp $@
-
.include <bsd.regress.mk>
diff --git a/regress/sys/kern/pledge/generic/systrace.filter.in b/regress/sys/kern/pledge/generic/systrace.filter.in
deleted file mode 100644
index eec2f2e538b..00000000000
--- a/regress/sys/kern/pledge/generic/systrace.filter.in
+++ /dev/null
@@ -1,78 +0,0 @@
-# $OpenBSD: systrace.filter.in,v 1.2 2015/11/03 10:32:41 semarie Exp $
-
-Policy: ${OBJDIR}/generic, Emulation: native
- native-issetugid: permit
- native-mprotect: prot eq "PROT_READ" then permit
- native-getentropy: permit
- native-mmap: prot eq "PROT_READ|PROT_WRITE" then permit
- native-mprotect: prot eq "PROT_NONE" then permit
- native-fsread: filename eq "/var/run/ld.so.hints" then permit
- native-fstat: permit
- native-mmap: prot eq "PROT_READ" then permit
- native-close: permit
- native-fsread: filename match "/usr/lib/libc.so.*" then permit
- native-read: permit
- native-mmap: prot eq "PROT_READ|PROT_EXEC" then permit
- native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC" then permit
- native-mprotect: prot eq "PROT_READ|PROT_WRITE" then permit
- native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permit
- native-munmap: permit
- native-kbind: permit
- native-sysctl: permit
- native-fsread: filename eq "/etc/malloc.conf" then permit
- native-minherit: permit
- native-fcntl: cmd eq "<unknown>: 11" then permit
- native-fswrite: filename eq "${OBJDIR}/generic.core" then permit
- native-write: permit
- native-pipe: permit
- native-fork: permit
- native-dup2: permit
- native-setsid: permit
- native-pledge: permit
- native-exit: permit
- native-wait4: permit
- native-pipe2: permit
- native-vfork: permit
- native-execve: filename eq "/bin/sh" and argv eq "sh -c /sbin/dmesg" then permit
- native-fcntl: cmd eq "F_GETFL" then permit
- native-fcntl: cmd eq "F_GETFD" then permit
- native-fcntl: cmd eq "F_SETFD" then permit
- native-fsread: filename eq "${OBJDIR}/generic.core" then permit
- native-socket: sockdom eq "AF_INET" and socktype eq "SOCK_STREAM" then permit
- native-kill: pidname eq "<own process group>" and signame eq "SIGINT" then permit
- native-fsread: filename eq "/dev/zero" then permit
- native-fswrite: filename eq "/dev/null" then permit
- native-fswrite: filename eq "/tmp/generic-test-cpath" then permit
- native-fsread: filename eq "/etc/passwd" then permit
- native-fsread: filename eq "${OBJDIR}/generic" then permit
- native-fsread: filename eq "/nonexistent" then permit
- native-fsread: filename eq "/usr" then permit
- native-fsread: filename eq "/usr/share" then permit
- native-fsread: filename eq "/usr/share/man" then permit
- native-fsread: filename eq "/usr/share/man/man8" then permit
- native-fsread: filename eq "/usr/share/man/man8/afterboot.8" then permit
- native-fsread: filename eq "/" then permit
- native-fsread: filename eq "/usr/bin" then permit
- native-fsread: filename eq "/usr/bin/gzip" then permit
- native-mmap: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC" then permit
- native-clock_getres: permit
- native-clock_gettime: permit
- native-getdtablecount: permit
- native-getegid: permit
- native-geteuid: permit
- native-getgid: permit
- native-getgroups: permit
- native-getitimer: permit
- native-getlogin: permit
- native-getpgid: permit
- native-getpgrp: permit
- native-getpid: permit
- native-getppid: permit
- native-getrlimit: permit
- native-getsid: permit
- native-getthrid: permit
- native-gettimeofday: permit
- native-getuid: permit
- native-umask: permit
- native-ioctl: permit
-