aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2017-11-29 11:50:30 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-11-29 11:50:30 +0000
commitac33f63b6f7f61de1e2dedcd65b18a056cd8aa81 (patch)
tree4ca8abbfa0a413fb8ea82dd578af5cf6d8795aa0
parent3cc9280fe7f341b60d4a2384d7fa6e33d575a7a2 (diff)
parentf01e1496ba4c520b011663b1ff634db7a668a383 (diff)
Merge "Move test scripts to tools/"
-rw-r--r--tools/cover.awk (renamed from tests/ci/cover.awk)0
-rw-r--r--tools/cover.sh (renamed from tests/ci/cover.sh)0
-rwxr-xr-xtools/run_tests.sh (renamed from run_tests.sh)2
-rw-r--r--tox.ini6
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/ci/cover.awk b/tools/cover.awk
index e4bb816..e4bb816 100644
--- a/tests/ci/cover.awk
+++ b/tools/cover.awk
diff --git a/tests/ci/cover.sh b/tools/cover.sh
index 780a85a..780a85a 100644
--- a/tests/ci/cover.sh
+++ b/tools/cover.sh
diff --git a/run_tests.sh b/tools/run_tests.sh
index dda7602..f253327 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 ed2fd4a..9a82878 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