summaryrefslogtreecommitdiff
path: root/.functests
diff options
context:
space:
mode:
authorGerard Gine <ggine@swiftstack.com>2018-02-13 17:00:22 -0800
committerGerard Gine <ggine@swiftstack.com>2018-02-14 12:31:17 -0800
commit57306181f1ffde3da1849c6d27e0b001d3bf5ea3 (patch)
tree2ede4f2fd26b42ba69e2abb506f9c79640ce0012 /.functests
parentb33941feda95b8e37c5bb68a2a5cdfe2007e3a4d (diff)
downloadswift-57306181f1ffde3da1849c6d27e0b001d3bf5ea3.tar.gz
Improved usage of args in .functests
If we're calling the script with any arguments, --pretty will not be passed to ostestr. Also redirected cd commands' output to /dev/null in .functests. Change-Id: I6e7e391c7e1659b86ab12eae4362b565218917b2
Diffstat (limited to '.functests')
-rwxr-xr-x.functests7
1 files changed, 4 insertions, 3 deletions
diff --git a/.functests b/.functests
index fb491a3af..bf920798c 100755
--- a/.functests
+++ b/.functests
@@ -5,10 +5,11 @@
SRC_DIR=$(python -c "import os; print os.path.dirname(os.path.realpath('$0'))")
-cd ${SRC_DIR}
+cd ${SRC_DIR} > /dev/null
export TESTS_DIR=${SRC_DIR}/test/functional
-ostestr --serial --pretty $@
+ARGS="--serial ${@:-"--pretty"}"
+ostestr $ARGS
rvalue=$?
-cd -
+cd - > /dev/null
exit $rvalue