openstack/oslosphinx
Code Issues Proposed changes

Update run_cross_tests.sh to latest

Browse Source 
Change-Id: I0f660fde6bae0cc5a4aa1b7deb9f94d3ffee0bc5
This commit is contained in:
Doug Hellmann
2015-01-20 13:18:54 -05:00
parent f640b5e3f8
commit ccf8e1a8a9
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/run_cross_tests.sh
View File

@@ -10,7 +10,10 @@
set -e set -e
project_dir="$1" project_dir="$1"
venv="$2" shift
venv="$1"
shift
posargs="$*"
if [ -z "$project_dir" -o -z "$venv" ] if [ -z "$project_dir" -o -z "$venv" ]
then then
@@ -19,11 +22,12 @@ ERROR: Missing argument(s)
Usage: Usage:
$0 PROJECT_DIR VIRTUAL_ENV $0 PROJECT_DIR VIRTUAL_ENV [POSARGS]
Example, run the python 2.7 tests for python-neutronclient: Example, run the python 2.7 tests for python-neutronclient:
$0 /opt/stack/python-neutronclient py27 $0 /opt/stack/python-neutronclient py27
$0 /opt/stack/nova py27 xenapi
EOF EOF
exit 1 exit 1
@@ -36,18 +40,23 @@ tox_envbin=$project_dir/.tox/$venv/bin
our_name=$(python setup.py --name) our_name=$(python setup.py --name)
# Build the egg-info, including the source file list,
# so we install all of the files, even if the package
# list or name has changed.
python setup.py egg_info
# Replace the pip-installed package with the version in our source # Replace the pip-installed package with the version in our source
# tree. Look to see if we are already installed before trying to # tree. Look to see if we are already installed before trying to
# uninstall ourselves, to avoid failures from packages that do not use us # uninstall ourselves, to avoid failures from packages that do not use us
# yet. # yet.
if $tox_envbin/pip freeze | grep -q $our_name if $tox_envbin/pip freeze | grep -q $our_name
then then
$tox_envbin/pip uninstall -y $our_name $tox_envbin/pip uninstall -y $our_name || echo "Ignoring error"
fi fi
$tox_envbin/pip install -U . $tox_envbin/pip install -U .
# Run the tests # Run the tests
(cd $project_dir && tox -e $venv) (cd $project_dir && tox -e $venv -- $posargs)
result=$? result=$?