diff options
author | Tim Rice <tim@multitalents.net> | 2013-02-19 19:01:51 -0800 |
---|---|---|
committer | Tim Rice <tim@multitalents.net> | 2013-02-19 19:01:51 -0800 |
commit | c31db8cd6e301c8d4024cb9250e3178d13d1be44 (patch) | |
tree | 2199bc2ede9202280b28363168e6cb016fbdaa59 /regress | |
parent | c08b3ef6f435b64c3b7125f93e5b3e661e019f3e (diff) | |
download | openssh-git-c31db8cd6e301c8d4024cb9250e3178d13d1be44.tar.gz |
- (tim) [krl.c Makefile.in regress/Makefile regress/modpipe.c] remove unneeded
err.h include from krl.c. Additional portability fixes for modpipe. OK djm
Diffstat (limited to 'regress')
-rw-r--r-- | regress/Makefile | 6 | ||||
-rwxr-xr-x | regress/modpipe.c | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/regress/Makefile b/regress/Makefile index c3aec43f..779abf4f 100644 --- a/regress/Makefile +++ b/regress/Makefile @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.62 2013/01/18 00:45:29 djm Exp $ REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t8 t9 t-exec -tests: prereq $(REGRESS_TARGETS) +tests: $(REGRESS_TARGETS) # Interop tests are not run by default interop interop-tests: t-exec-interop @@ -146,10 +146,6 @@ t9: $(OBJ)/t9.out test "${TEST_SSH_ECC}" != yes || \ ${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t9.out > /dev/null -prereq: modpipe - -modpipe: modpipe.c - t-exec: ${LTESTS:=.sh} @if [ "x$?" = "x" ]; then exit 0; fi; \ for TEST in ""$?; do \ diff --git a/regress/modpipe.c b/regress/modpipe.c index b05915b6..1d422988 100755 --- a/regress/modpipe.c +++ b/regress/modpipe.c @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: modpipe.c,v 1.2 2013/02/19 02:15:08 djm Exp $ */ +/* $Id: modpipe.c,v 1.3 2013/02/20 03:01:52 tim Exp $ */ #include <sys/types.h> #include <unistd.h> @@ -23,6 +23,7 @@ #include <stdarg.h> #include <stdlib.h> #include <errno.h> +#include "openbsd-compat/getopt.c" static void err(int, const char *, ...) __attribute__((format(printf, 2, 3))); static void errx(int, const char *, ...) __attribute__((format(printf, 2, 3))); |