From: Emma Foley <emma.l.foley@intel.com>
Date: Tue, 7 Nov 2017 21:04:08 +0000 (+0000)
Subject: Move test scripts to tools/
X-Git-Tag: opnfv-6.0.0~266^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f01e1496ba4c520b011663b1ff634db7a668a383;p=yardstick.git

Move test scripts to tools/

Move the scripts that tox uses for running tests
to the tools/ directory:
* run_tests.sh -> tools/run_tests.sh
* tests/ci/cover.{sh,awk} -> tools/

JIRA: YARDSTICK-837
Change-Id: I817c9e5f58c06b45f1de3f369318f4bb24168677
Signed-off-by: Emma Foley <emma.l.foley@intel.com>
---

diff --git a/tests/ci/cover.awk b/tools/cover.awk
similarity index 100%
rename from tests/ci/cover.awk
rename to tools/cover.awk
diff --git a/tests/ci/cover.sh b/tools/cover.sh
similarity index 100%
rename from tests/ci/cover.sh
rename to tools/cover.sh
diff --git a/run_tests.sh b/tools/run_tests.sh
similarity index 98%
rename from run_tests.sh
rename to tools/run_tests.sh
index dda760218..f253327e5 100755
--- a/run_tests.sh
+++ b/tools/run_tests.sh
@@ -20,7 +20,7 @@ export PYTHONDONTWRITEBYTECODE=1
 PY_VER="py$( python --version | sed 's/[^[:digit:]]//g' | cut -c-2 )"
 export PY_VER
 
-COVER_DIR_NAME="./tests/ci/"
+COVER_DIR_NAME="./tools/"
 export COVER_DIR_NAME
 
 run_tests() {
diff --git a/tox.ini b/tox.ini
index ed2fd4a7d..9a82878b0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,7 @@ whitelist_externals = /bin/bash
 
 [testenv:py27]
 commands =
-  /bin/bash ./run_tests.sh --unit
+  /bin/bash {toxinidir}/tools/run_tests.sh --unit
 
 [testenv:py3]
 basepython = python3
@@ -32,11 +32,11 @@ commands =
 [testenv:coverage]
 basepython = python3
 commands =
-  /bin/bash ./run_tests.sh --coverage
+  /bin/bash {toxinidir}/tools/run_tests.sh --coverage
 
 [testenv:functional]
 commands =
-  /bin/bash ./run_tests.sh --functional
+  /bin/bash {toxinidir}/tools/run_tests.sh --functional
 
 [testenv:functional-py3]
 basepython = python3