diff options
Diffstat (limited to 'bin/pwait')
| -rw-r--r-- | bin/pwait/Makefile | 2 | ||||
| -rw-r--r-- | bin/pwait/Makefile.depend | 2 | ||||
| -rw-r--r-- | bin/pwait/pwait.1 | 6 | ||||
| -rw-r--r-- | bin/pwait/pwait.c | 3 | ||||
| -rw-r--r-- | bin/pwait/tests/Makefile | 2 | ||||
| -rw-r--r-- | bin/pwait/tests/Makefile.depend | 1 | ||||
| -rw-r--r-- | bin/pwait/tests/pwait_test.sh | 13 |
7 files changed, 8 insertions, 21 deletions
diff --git a/bin/pwait/Makefile b/bin/pwait/Makefile index 210ae3cdb918..99e6534034dc 100644 --- a/bin/pwait/Makefile +++ b/bin/pwait/Makefile @@ -1,5 +1,3 @@ -# $FreeBSD$ - .include <src.opts.mk> PACKAGE=runtime diff --git a/bin/pwait/Makefile.depend b/bin/pwait/Makefile.depend index 6cfaab1c3644..6ef78fac5cbf 100644 --- a/bin/pwait/Makefile.depend +++ b/bin/pwait/Makefile.depend @@ -1,8 +1,6 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ diff --git a/bin/pwait/pwait.1 b/bin/pwait/pwait.1 index b9b651bfc905..83ac8bcef317 100644 --- a/bin/pwait/pwait.1 +++ b/bin/pwait/pwait.1 @@ -30,8 +30,6 @@ .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY .\" OF SUCH DAMAGE. .\" -.\" $FreeBSD$ -.\" .Dd January 21, 2021 .Dt PWAIT 1 .Os @@ -99,7 +97,7 @@ $ sleep 30 & sleep 3600 & [1] 1646 [2] 1647 $ pwait -o -t5 1646 1647 -$? +$ echo $? 124 .Ed .Pp @@ -113,7 +111,7 @@ $ sleep 30 & sleep 3600 & [2] 1653 $ pwait -v -t 5 1652 1653 timeout -$? +$ echo $? 124 .Ed .Pp diff --git a/bin/pwait/pwait.c b/bin/pwait/pwait.c index 66919ffa1c42..0fae22562607 100644 --- a/bin/pwait/pwait.c +++ b/bin/pwait/pwait.c @@ -31,9 +31,6 @@ * OF SUCH DAMAGE. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - #include <sys/types.h> #include <sys/event.h> #include <sys/time.h> diff --git a/bin/pwait/tests/Makefile b/bin/pwait/tests/Makefile index db05b1f1051c..4e355ccfe787 100644 --- a/bin/pwait/tests/Makefile +++ b/bin/pwait/tests/Makefile @@ -1,5 +1,3 @@ -# $FreeBSD$ - ATF_TESTS_SH= pwait_test .include <bsd.test.mk> diff --git a/bin/pwait/tests/Makefile.depend b/bin/pwait/tests/Makefile.depend index f80275d86ab1..11aba52f82cf 100644 --- a/bin/pwait/tests/Makefile.depend +++ b/bin/pwait/tests/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/bin/pwait/tests/pwait_test.sh b/bin/pwait/tests/pwait_test.sh index 07ed21706fd5..66bdd6981704 100644 --- a/bin/pwait/tests/pwait_test.sh +++ b/bin/pwait/tests/pwait_test.sh @@ -1,4 +1,3 @@ -# $FreeBSD$ atf_test_case basic basic_head() @@ -88,37 +87,37 @@ time_unit_body() atf_check \ -o empty \ -e empty \ - -s exit:143 \ + -s signal:15 \ timeout --preserve-status 2 pwait -t 100000000 $init atf_check \ -o empty \ -e empty \ - -s exit:143 \ + -s signal:15 \ timeout --preserve-status 2 pwait -t 1h $init atf_check \ -o empty \ -e empty \ - -s exit:143 \ + -s signal:15 \ timeout --preserve-status 2 pwait -t 1.5h $init atf_check \ -o empty \ -e empty \ - -s exit:143 \ + -s signal:15 \ timeout --preserve-status 2 pwait -t 1m $init atf_check \ -o empty \ -e empty \ - -s exit:143 \ + -s signal:15 \ timeout --preserve-status 2 pwait -t 1.5m $init atf_check \ -o empty \ -e empty \ - -s exit:143 \ + -s signal:15 \ timeout --preserve-status 2 pwait -t 0 $init # The rest are fast enough that pwait -t is expected to trigger |