mirror of
https://github.com/versity/scoutfs.git
synced 2026-01-03 10:55:20 +00:00
cf05aefe50
The t_quiet test command execution helper was constantly truncating the quiet.log with the output of each command. It was meant to show each command and its output as they're run. Signed-off-by: Zach Brown <zab@versity.com>
71 lines
1.2 KiB
Bash
71 lines
1.2 KiB
Bash
|
|
t_status_msg()
|
|
{
|
|
echo "$*" > "$T_TMPDIR/status.msg"
|
|
}
|
|
|
|
export T_PASS_STATUS=100
|
|
export T_SKIP_STATUS=101
|
|
export T_FAIL_STATUS=102
|
|
export T_FIRST_STATUS="$T_PASS_STATUS"
|
|
export T_LAST_STATUS="$T_FAIL_STATUS"
|
|
|
|
t_pass()
|
|
{
|
|
exit $T_PASS_STATUS
|
|
}
|
|
|
|
t_skip()
|
|
{
|
|
t_status_msg "$@"
|
|
exit $T_SKIP_STATUS
|
|
}
|
|
|
|
t_fail()
|
|
{
|
|
t_status_msg "$@"
|
|
exit $T_FAIL_STATUS
|
|
}
|
|
|
|
#
|
|
# Quietly run a command during a test. If it succeeds then we have a
|
|
# log of its execution but its output isn't included in the test's
|
|
# compared output. If it fails then the test fails.
|
|
#
|
|
t_quiet()
|
|
{
|
|
echo "# $*" >> "$T_TMPDIR/quiet.log"
|
|
"$@" >> "$T_TMPDIR/quiet.log" 2>&1 || \
|
|
t_fail "quiet command failed"
|
|
}
|
|
|
|
#
|
|
# Quietly run a command during a test. The output is logged but only
|
|
# the return code is printed, presumably because the output contains
|
|
# a lot of invocation specific text that is difficult to filter.
|
|
#
|
|
t_rc()
|
|
{
|
|
echo "# $*" >> "$T_TMP.rc.log"
|
|
"$@" >> "$T_TMP.rc.log" 2>&1
|
|
echo "rc: $?"
|
|
}
|
|
|
|
#
|
|
# redirect test output back to the output of the invoking script intead
|
|
# of the compared output.
|
|
#
|
|
t_restore_output()
|
|
{
|
|
exec >&6 2>&1
|
|
}
|
|
|
|
#
|
|
# redirect a command's output back to the compared output after the
|
|
# test has restored its output
|
|
#
|
|
t_compare_output()
|
|
{
|
|
"$@" >&7 2>&1
|
|
}
|