- dont say all tests were successful when we failed
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1112 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
parent
4be5cbd6c8
commit
059d37757d
|
@ -33,6 +33,8 @@ if [ -z "$__p15init__" ]; then
|
||||||
# Redirect output to log file, but keep copies of
|
# Redirect output to log file, but keep copies of
|
||||||
# stdout/stderr descriptors on fd 3 and 4
|
# stdout/stderr descriptors on fd 3 and 4
|
||||||
exec 3>&1 4>&2 >$p15log 2>&1
|
exec 3>&1 4>&2 >$p15log 2>&1
|
||||||
|
|
||||||
|
test_failed=false
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Clobber log file
|
# Clobber log file
|
||||||
|
@ -42,11 +44,13 @@ function atexit {
|
||||||
|
|
||||||
test "$p15temp" && rm -rf $p15temp
|
test "$p15temp" && rm -rf $p15temp
|
||||||
|
|
||||||
msg <<-EOF
|
if ! $test_failed; then
|
||||||
:::
|
msg <<-EOF
|
||||||
::: Test set completed successfully
|
:::
|
||||||
:::
|
::: Test set completed successfully
|
||||||
|
:::
|
||||||
EOF
|
EOF
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function msg {
|
function msg {
|
||||||
|
@ -81,6 +85,7 @@ function fail {
|
||||||
echo "---"
|
echo "---"
|
||||||
cat $p15log
|
cat $p15log
|
||||||
) >&4
|
) >&4
|
||||||
|
test_failed=true
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue