diff options
author | Jan Pokorný <jpokorny@redhat.com> | 2014-11-11 15:08:08 +0100 |
---|---|---|
committer | Jan Pokorný <jpokorny@redhat.com> | 2014-11-14 22:10:58 +0100 |
commit | 6530681f7a10fcbfa3516af48f9a5df39e2ed920 (patch) | |
tree | 94dfc7e036174a3a80b25e02256aacb7a699bfbd | |
parent | 8380bdd214b23c21b3d121bf64927b5305ca061a (diff) | |
download | clufter-6530681f7a10fcbfa3516af48f9a5df39e2ed920.tar.gz clufter-6530681f7a10fcbfa3516af48f9a5df39e2ed920.tar.xz clufter-6530681f7a10fcbfa3516af48f9a5df39e2ed920.zip |
run-tests: simplify conditionals
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
-rwxr-xr-x | __root__/run-tests | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/__root__/run-tests b/__root__/run-tests index cbedf5c..a85712f 100755 --- a/__root__/run-tests +++ b/__root__/run-tests @@ -66,15 +66,10 @@ while [ $# -gt 0 ]; do esac shift done -if [ ! -t 0 ]; then - TAIL= -fi -if [ -z "${ACC}" ]; then - ACC=" discover -s tests -p '*.py'" - if [ "${VERBOSE}" -eq 1 ]; then - ACC="${ACC} --verbose" - fi -fi + +[ -n "${ACC}" ] || ACC="discover -s tests -p '*.py'" +[ "${VERBOSE}" -eq 0 ] || ACC="${ACC} --verbose" +[ -t 0 ] || TAIL= # signal-based harness to catch non-zero retval while isolating PWD changes # in the subshell |