openstack
/
os-ken
Code Issues Proposed changes

test: remove some unnecessary bash dependencies 

/bin/bash is not so ubiquitous.

Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
YAMAMOTO Takashi 2013-01-30 14:24:23 +09:00 committed by FUJITA Tomonori
parent 6a5738c92a
commit 49bf5c9991
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
run_tests.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/sh
function usage { usage() {
echo "Usage: $0 [OPTION]..." echo "Usage: $0 [OPTION]..."
echo "Run Ryu's test suite(s)" echo "Run Ryu's test suite(s)"
echo "" echo ""
@ -20,15 +20,15 @@ function usage {
exit exit
} }
function process_option { process_option() {
case "$1" in case "$1" in
-h|--help) usage;; -h|--help) usage;;
-V|--virtual-env) let always_venv=1; let never_venv=0;; -V|--virtual-env) always_venv=1; never_venv=0;;
-N|--no-virtual-env) let always_venv=0; let never_venv=1;; -N|--no-virtual-env) always_venv=0; never_venv=1;;
-f|--force) let force=1;; -f|--force) force=1;;
-p|--pep8) let just_pep8=1;let never_venv=1; let always_venv=0;; -p|--pep8) just_pep8=1; never_venv=1; always_venv=0;;
-P|--no-pep8) no_pep8=1;; -P|--no-pep8) no_pep8=1;;
-l|--pylint) let just_pylint=1;; -l|--pylint) just_pylint=1;;
-c|--coverage) coverage=1;; -c|--coverage) coverage=1;;
-v|--verbose) verbose=1;; -v|--verbose) verbose=1;;
-*) noseopts="$noseopts $1";; -*) noseopts="$noseopts $1";;
@ -58,7 +58,7 @@ if [ $coverage -eq 1 ]; then
noseopts="$noseopts --with-coverage --cover-package=ryu" noseopts="$noseopts --with-coverage --cover-package=ryu"
fi fi
function run_tests { run_tests() {
# Just run the test suites in current environment # Just run the test suites in current environment
${wrapper} rm -f ./$PLUGIN_DIR/tests.sqlite ${wrapper} rm -f ./$PLUGIN_DIR/tests.sqlite
@ -80,7 +80,7 @@ function run_tests {
return $RESULT return $RESULT
} }
function run_pylint { run_pylint() {
echo "Running pylint ..." echo "Running pylint ..."
PYLINT_OPTIONS="--rcfile=.pylintrc --output-format=parseable" PYLINT_OPTIONS="--rcfile=.pylintrc --output-format=parseable"
PYLINT_INCLUDE="ryu bin/ryu-manager bin/ryu-client" PYLINT_INCLUDE="ryu bin/ryu-manager bin/ryu-client"
@ -96,7 +96,7 @@ function run_pylint {
export PYTHONPATH=$OLD_PYTHONPATH export PYTHONPATH=$OLD_PYTHONPATH
} }
function run_pep8 { run_pep8() {
echo "Running pep8 ..." echo "Running pep8 ..."
PEP8_EXCLUDE="vcsversion.py,*.pyc,contrib" PEP8_EXCLUDE="vcsversion.py,*.pyc,contrib"

4
tools/with_venv.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
# vim: tabstop=4 shiftwidth=4 softtabstop=4 # vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2011 OpenStack LLC. # Copyright 2011 OpenStack LLC.
@ -18,4 +18,4 @@
TOOLS=`dirname $0` TOOLS=`dirname $0`
VENV=$TOOLS/../.venv VENV=$TOOLS/../.venv
source $VENV/bin/activate && $@ . $VENV/bin/activate && $@