Merge "Move test scripts to tools/"
authorRoss Brattain <ross.b.brattain@intel.com>
Wed, 29 Nov 2017 11:50:30 +0000 (11:50 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 29 Nov 2017 11:50:30 +0000 (11:50 +0000)
tools/cover.awk [moved from tests/ci/cover.awk with 100% similarity]
tools/cover.sh [moved from tests/ci/cover.sh with 100% similarity]
tools/run_tests.sh [moved from run_tests.sh with 98% similarity]
tox.ini

similarity index 100%
rename from tests/ci/cover.awk
rename to tools/cover.awk
similarity index 100%
rename from tests/ci/cover.sh
rename to tools/cover.sh
similarity index 98%
rename from run_tests.sh
rename to tools/run_tests.sh
index dda7602..f253327 100755 (executable)
@@ -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 ed2fd4a..9a82878 100644 (file)
--- 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