提交 35641310 编写于 作者: M Markus Heidelberg 提交者: Junio C Hamano

use uppercase POSIX compliant signals for the 'trap' command

In 'man 1p trap' there is written:

    "Implementations may permit names with the SIG prefix or ignore case
    in signal names as an extension."

So change the lowercase signals to uppercase, which is POSIX compliant
instead of being an extension.

There wasn't anybody claiming that it doesn't work, but there was a bug
with using a signal with the SIG prefix, which is an extension as well.
So let's play it safe and change it, since it doesn't hurt anyone.

While at it, also convert 8 indentation spaces to 1 tab character.
Signed-off-by: NMarkus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 bc08fc4e
......@@ -20,9 +20,9 @@ HTTPD_DOCUMENT_ROOT_PATH=$HTTPD_ROOT_PATH/www
if ! test -x "$LIB_HTTPD_PATH"
then
say "skipping test, no web server found at '$LIB_HTTPD_PATH'"
test_done
exit
say "skipping test, no web server found at '$LIB_HTTPD_PATH'"
test_done
exit
fi
HTTPD_VERSION=`$LIB_HTTPD_PATH -v | \
......@@ -84,7 +84,7 @@ prepare_httpd() {
start_httpd() {
prepare_httpd
trap 'stop_httpd; die' exit
trap 'stop_httpd; die' EXIT
"$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \
-f "$TEST_PATH/apache.conf" $HTTPD_PARA \
......@@ -92,7 +92,7 @@ start_httpd() {
}
stop_httpd() {
trap 'die' exit
trap 'die' EXIT
"$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \
-f "$TEST_PATH/apache.conf" -k stop
......
......@@ -127,7 +127,7 @@ fi
error () {
say_color error "error: $*"
trap - exit
trap - EXIT
exit 1
}
......@@ -163,7 +163,7 @@ die () {
exit 1
}
trap 'die' exit
trap 'die' EXIT
# The semantics of the editor variables are that of invoking
# sh -c "$EDITOR \"$@\"" files ...
......@@ -208,7 +208,7 @@ test_failure_ () {
say_color error "FAIL $test_count: $1"
shift
echo "$@" | sed -e 's/^/ /'
test "$immediate" = "" || { trap - exit; exit 1; }
test "$immediate" = "" || { trap - EXIT; exit 1; }
}
test_known_broken_ok_ () {
......@@ -416,7 +416,7 @@ test_create_repo () {
}
test_done () {
trap - exit
trap - EXIT
test_results_dir="$TEST_DIRECTORY/test-results"
mkdir -p "$test_results_dir"
test_results_path="$test_results_dir/${0%-*}-$$"
......@@ -493,7 +493,7 @@ fi
test="trash directory.$(basename "$0" .sh)"
test ! -z "$debug" || remove_trash="$TEST_DIRECTORY/$test"
rm -fr "$test" || {
trap - exit
trap - EXIT
echo >&5 "FATAL: Cannot prepare test area"
exit 1
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册