mirror of
https://github.com/samba-team/samba.git
synced 2025-01-22 22:04:08 +03:00
fe17acfa82
Previously, the output from $cmdline was never captured. In case of a failure, there was no output being passed to the subunit_fail_test() function, but that function contains a call to "cat -". This caused the script to hang indefinitely waiting for input. We now capture $cmdline output (including mapping stderr to stdout) using backticks, and then pipe that output to the subunit_fail_test() if there is a failure. (This used to be commit c0234d13192c1871971b45121249395ef15c5ae5)
68 lines
1.9 KiB
Bash
Executable File
68 lines
1.9 KiB
Bash
Executable File
#
|
|
# subunit.sh: shell functions to report test status via the subunit protocol.
|
|
# Copyright (C) 2006 Robert Collins <robertc@robertcollins.net>
|
|
# Copyright (C) 2008 Jelmer Vernooij <jelmer@samba.org>
|
|
#
|
|
# 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 2 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, write to the Free Software
|
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
#
|
|
|
|
subunit_start_test () {
|
|
# emit the current protocol start-marker for test $1
|
|
echo "test: $1"
|
|
}
|
|
|
|
|
|
subunit_pass_test () {
|
|
# emit the current protocol test passed marker for test $1
|
|
echo "success: $1"
|
|
}
|
|
|
|
|
|
subunit_fail_test () {
|
|
# emit the current protocol fail-marker for test $1, and emit stdin as
|
|
# the error text.
|
|
# we use stdin because the failure message can be arbitrarily long, and this
|
|
# makes it convenient to write in scripts (using <<END syntax.
|
|
echo "failure: $1 ["
|
|
cat -
|
|
echo "]"
|
|
}
|
|
|
|
|
|
subunit_error_test () {
|
|
# emit the current protocol error-marker for test $1, and emit stdin as
|
|
# the error text.
|
|
# we use stdin because the failure message can be arbitrarily long, and this
|
|
# makes it convenient to write in scripts (using <<END syntax.
|
|
echo "error: $1 ["
|
|
cat -
|
|
echo "]"
|
|
}
|
|
|
|
testit () {
|
|
name="$1"
|
|
shift
|
|
cmdline="$*"
|
|
subunit_start_test "$name"
|
|
output=`$cmdline 2>&1`
|
|
status=$?
|
|
if [ x$status = x0 ]; then
|
|
subunit_pass_test "$name"
|
|
else
|
|
echo $output | subunit_fail_test "$name"
|
|
fi
|
|
return $status
|
|
}
|