diff options
| author | Anton Lindqvist <anton@cvs.openbsd.org> | 2024-03-05 07:01:41 +0000 |
|---|---|---|
| committer | Anton Lindqvist <anton@cvs.openbsd.org> | 2024-03-05 07:01:41 +0000 |
| commit | 0d74db870fbb2e84118058701a42d7be9da72d6d (patch) | |
| tree | c9b59f7033e8b4641a83067ee5eb075441eb5156 /regress/libexec | |
| parent | f87c183bfe3795e4ea44bfa7d730306333a9dc2d (diff) | |
Make ftpd tests less flaky by ensuring the server has terminated before
starting a new one.
Diffstat (limited to 'regress/libexec')
| -rw-r--r-- | regress/libexec/ftpd/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/regress/libexec/ftpd/Makefile b/regress/libexec/ftpd/Makefile index fe6bfdc625b..35ccfc7484e 100644 --- a/regress/libexec/ftpd/Makefile +++ b/regress/libexec/ftpd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2021/05/09 14:26:45 jan Exp $ +# $OpenBSD: Makefile,v 1.12 2024/03/05 07:01:40 anton Exp $ .PHONY: setup-ftpd @@ -41,6 +41,7 @@ regress: setup-ftpd: ${SUDO} pkill tcpserver || true ${SUDO} pkill ftpd || true + nc 127.0.0.1 21 >/dev/null 2>&1 || true # start ftpd ${SUDO} ${TCPSERVER} 127.0.0.1 21 ${KTRACE} ${FTPD} -A & \ timeout=$$(($$(date +%s) + 5)); \ |