From 265c4b83a81c643f3359be926ef8034f28f321ed Mon Sep 17 00:00:00 2001 From: Pádraig Brady
Date: Fri, 28 Mar 2008 11:05:55 +0000
Subject: new program: timeout
* AUTHORS: Register as the author.
* NEWS: Mention this change.
* README: Add timeout command to list.
* src/timeout.c: New file.
* src/kill.c (operand2sig): Move function to its own file,
now that timeout.c will also use it.
* src/operand2sig.c (operand2sig): New file, extracted from kill.c.
* src/operand2sig.h (operand2sig): Declare.
* src/Makefile.am (EXTRA_PROGRAMS): Add timeout.
* src/.gitignore: Add timeout binary to list to ignore.
* doc/coreutils.texi (timeout invocation): Add timeout info.
(Signal specifications): New section, also referenced by kill.
* man/Makefile.am (timeout.1): Add dependency.
* man/timeout.x: New file.
* po/POTFILES.in: Add timeout.c and operand2sig.c to list to translate.
* tests/Makefile.am (TESTS): Add the two new tests.
* tests/misc/help-version: Add support for new timeout command.
* tests/misc/invalid-opt: Add support for new timeout command.
* tests/misc/timeout: New file: check basic timeout operation.
* tests/misc/timeout-parameters: New file: check invalid parameter
combinations.
---
tests/Makefile.am | 2 ++
tests/misc/help-version | 2 ++
tests/misc/invalid-opt | 1 +
tests/misc/timeout | 44 ++++++++++++++++++++++++++++++++++
tests/misc/timeout-parameters | 55 +++++++++++++++++++++++++++++++++++++++++++
5 files changed, 104 insertions(+)
create mode 100755 tests/misc/timeout
create mode 100755 tests/misc/timeout-parameters
(limited to 'tests')
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1b7dcfa64..e5042b96b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -209,6 +209,8 @@ TESTS = \
misc/tee \
misc/tee-dash \
misc/test-diag \
+ misc/timeout \
+ misc/timeout-parameters \
misc/tr \
misc/tsort \
misc/tty-eof \
diff --git a/tests/misc/help-version b/tests/misc/help-version
index 1dcf96f92..ff0133a22 100755
--- a/tests/misc/help-version
+++ b/tests/misc/help-version
@@ -28,6 +28,7 @@ export SHELL
. $srcdir/test-lib.sh
expected_failure_status_nohup=127
+expected_failure_status_timeout=125
expected_failure_status_printenv=2
expected_failure_status_tty=3
expected_failure_status_sort=2
@@ -146,6 +147,7 @@ printf_args=foo
seq_args=10
sleep_args=0
su_args=--version
+timeout_args=--version
# I'd rather not run sync, since it spins up disks that I've
# deliberately caused to spin down (but not unmounted).
diff --git a/tests/misc/invalid-opt b/tests/misc/invalid-opt
index 569a027e7..cbd41cae1 100755
--- a/tests/misc/invalid-opt
+++ b/tests/misc/invalid-opt
@@ -33,6 +33,7 @@ my %exit_status =
nohup => 127,
sort => 2,
test => 0,
+ timeout => 125,
true => 0,
tty => 2,
printf => 0,
diff --git a/tests/misc/timeout b/tests/misc/timeout
new file mode 100755
index 000000000..7f52f6e27
--- /dev/null
+++ b/tests/misc/timeout
@@ -0,0 +1,44 @@
+#!/bin/sh
+# Validate timeout basic operation
+
+# Copyright (C) 2008 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see