diff options
| author | Doug Hellmann <doug.hellmann@dreamhost.com> | 2014-03-27 08:02:02 -0700 |
|---|---|---|
| committer | Doug Hellmann <doug.hellmann@dreamhost.com> | 2014-03-27 08:02:02 -0700 |
| commit | 588fba7bdeea62a2a0853bb7cc6c75f3656b377c (patch) | |
| tree | e8c199ed6dcfbb4c69a749134cb4c504ac7cb2fb | |
| parent | bf3b180f48487e7ea0627a7feedcf23963287d41 (diff) | |
| download | oslotest-588fba7bdeea62a2a0853bb7cc6c75f3656b377c.tar.gz | |
Import run_cross_tests.sh from oslo-incubator1.0.0
Replace the local version of run_cross_tests.sh with
the version in oslo-incubator.
Depends on https://review.openstack.org/#/c/83411/
and https://review.openstack.org/#/c/83412/
Change-Id: I3d3e25f92ab6337432b54967a381662f32902a6d
| -rw-r--r-- | openstack-common.conf | 7 | ||||
| -rwxr-xr-x | tools/run_cross_tests.sh | 10 |
2 files changed, 13 insertions, 4 deletions
diff --git a/openstack-common.conf b/openstack-common.conf new file mode 100644 index 0000000..3fffac5 --- /dev/null +++ b/openstack-common.conf @@ -0,0 +1,7 @@ +[DEFAULT] + +# The list of modules to copy from oslo-incubator.git +script = tools/run_cross_tests.sh + +# The base module to hold the copy of openstack.common +base=oslotest diff --git a/tools/run_cross_tests.sh b/tools/run_cross_tests.sh index 0a20839..fb21e65 100755 --- a/tools/run_cross_tests.sh +++ b/tools/run_cross_tests.sh @@ -13,13 +13,15 @@ venv="$2" tox_envbin=$project_dir/.tox/$venv/bin +our_name=$(python setup.py --name) + # Replace the pip-installed package with the version in our source -# tree. Look to see if oslotest is already installed before trying to -# uninstall it, to avoid failures from packages that do not use it +# tree. Look to see if we are already installed before trying to +# uninstall ourselves, to avoid failures from packages that do not use us # yet. -if $tox_envbin/pip freeze | grep -q oslotest +if $tox_envbin/pip freeze | grep -q $our_name then - $tox_envbin/pip uninstall -y oslotest + $tox_envbin/pip uninstall -y $our_name fi $tox_envbin/pip install -U . |