glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: move check_* functions from options-syntax.test to separate file

Browse Source 
* tests/options-syntax.test: Move check_* functions to ...
* tests/syntax.sh: ... new file.
* tests/Makefile.am (EXTRA_DIST): Add syntax.sh.
This commit is contained in:
Nikolay Marchuk 2017-07-17 10:44:51 +07:00 committed by Dmitry V. Levin
parent b75c5b14e7
commit 35c006d93c
3 changed files with 83 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/Makefile.am
View File

@ -358,6 +358,7 @@ EXTRA_DIST = \
strace.supp \
struct_flock.c \
sun_path.expected \
syntax.sh \
trace_fstat.in \
trace_fstatfs.in \
trace_lstat.in \

52
tests/options-syntax.test
View File

@ -28,57 +28,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
. "${srcdir=.}/init.sh"
check_exit_status_and_stderr()
{
$STRACE "$@" 2> "$LOG" &&
dump_log_and_fail_with \
"strace $* failed to handle the error properly"
match_diff "$LOG" "$EXP" ||
dump_log_and_fail_with \
"strace $* failed to print expected diagnostics"
}
check_exit_status_and_stderr_using_grep()
{
$STRACE "$@" 2> "$LOG" &&
dump_log_and_fail_with \
"strace $* failed to handle the error properly"
match_grep "$LOG" "$EXP" ||
dump_log_and_fail_with \
"strace $* failed to print expected diagnostics"
}
strace_exp="${STRACE##* }"
check_e()
{
local pattern="$1"; shift
cat > "$EXP" << __EOF__
$strace_exp: $pattern
__EOF__
check_exit_status_and_stderr "$@"
}
check_e_using_grep()
{
local pattern="$1"; shift
cat > "$EXP" << __EOF__
$strace_exp: $pattern
__EOF__
check_exit_status_and_stderr_using_grep "$@"
}
check_h()
{
local pattern="$1"; shift
cat > "$EXP" << __EOF__
$strace_exp: $pattern
Try '$strace_exp -h' for more information.
__EOF__
check_exit_status_and_stderr "$@"
}
. "${srcdir=.}/syntax.sh"
check_e "Invalid process id: '0'" -p 0
check_e "Invalid process id: '-42'" -p -42

81
tests/syntax.sh Normal file
View File

@ -0,0 +1,81 @@
#!/bin/sh
#
# Define syntax testing primitives.
#
# Copyright (c) 2016 Dmitry V. Levin <ldv@altlinux.org>
# Copyright (c) 2016-2017 The strace developers.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# 3. The name of the author may not be used to endorse or promote products
# derived from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
. "${srcdir=.}/init.sh"
check_exit_status_and_stderr()
{
$STRACE "$@" 2> "$LOG" &&
dump_log_and_fail_with \
"strace $* failed to handle the error properly"
match_diff "$LOG" "$EXP" ||
dump_log_and_fail_with \
"strace $* failed to print expected diagnostics"
}
check_exit_status_and_stderr_using_grep()
{
$STRACE "$@" 2> "$LOG" &&
dump_log_and_fail_with \
"strace $* failed to handle the error properly"
match_grep "$LOG" "$EXP" ||
dump_log_and_fail_with \
"strace $* failed to print expected diagnostics"
}
strace_exp="${STRACE##* }"
check_e()
{
local pattern="$1"; shift
cat > "$EXP" << __EOF__
$strace_exp: $pattern
__EOF__
check_exit_status_and_stderr "$@"
}
check_e_using_grep()
{
local pattern="$1"; shift
cat > "$EXP" << __EOF__
$strace_exp: $pattern
__EOF__
check_exit_status_and_stderr_using_grep "$@"
}
check_h()
{
local pattern="$1"; shift
cat > "$EXP" << __EOF__
$strace_exp: $pattern
Try '$strace_exp -h' for more information.
__EOF__
check_exit_status_and_stderr "$@"
}