From 588fba7bdeea62a2a0853bb7cc6c75f3656b377c Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug.hellmann@dreamhost.com>
Date: Thu, 27 Mar 2014 08:02:02 -0700
Subject: [PATCH] Import run_cross_tests.sh from oslo-incubator

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
---
 openstack-common.conf    |  7 +++++++
 tools/run_cross_tests.sh | 10 ++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 openstack-common.conf

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 .