- name these TOX_ so that we can set them unconditionally

without them getting used unless we ask for them in the
build

Change-Id: Iec157ce9e70366af275acac959527461faebfdc1

diff --git a/tox.ini b/tox.ini
index 5f306a4309269aaaa14f79c2419bdfa16d6d5e4c..1606cd5c260bf633270dedb83849df494b805c32 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -47,21 +47,21 @@ setenv=
     PYTHONNOUSERSITE=1
     BASECOMMAND=python -m pytest
 
-    WORKERS={env:WORKERS:-n4}
-    oracle: WORKERS={env:WORKERS:-n2}
+    WORKERS={env:TOX_WORKERS:-n4}
+    oracle: WORKERS={env:TOX_WORKERS:-n2}
     nocext: DISABLE_SQLALCHEMY_CEXT=1
     cov: COVERAGE={[testenv]cov_args}
-    sqlite: SQLITE={env:SQLITE:--db sqlite}
-    postgresql: POSTGRESQL={env:POSTGRESQL:--db postgresql}
-    mysql: MYSQL={env:MYSQL:--db mysql --db pymysql}
-    oracle: ORACLE={env:ORACLE:--db oracle} --write-idents oracle_idents.txt --nomemory
-    mssql: MSSQL={env:MSSQL:--db pyodbc --db pymssql}
+    sqlite: SQLITE={env:TOX_SQLITE:--db sqlite}
+    postgresql: POSTGRESQL={env:TOX_POSTGRESQL:--db postgresql}
+    mysql: MYSQL={env:TOX_MYSQL:--db mysql --db pymysql}
+    oracle: ORACLE={env:TOX_ORACLE:--db oracle} --write-idents oracle_idents.txt --nomemory
+    mssql: MSSQL={env:TOX_MSSQL:--db pyodbc --db pymssql}
     backendonly: BACKENDONLY=--backend-only
 
 # tox as of 2.0 blocks all environment variables from the
 # outside, unless they are here (or in TOX_TESTENV_PASSENV,
 # wildcards OK).  Need at least these
-passenv=ORACLE_HOME NLS_LANG POSTGRESQL MYSQL ORACLE MSSQL SQLITE WORKERS
+passenv=ORACLE_HOME NLS_LANG TOX_POSTGRESQL TOX_MYSQL TOX_ORACLE TOX_MSSQL TOX_SQLITE TOX_WORKERS
 
 # for nocext, we rm *.so in lib in case we are doing usedevelop=True
 commands=