- backport new tox config options from 1.2

Change-Id: I081463ecc24bc5059018ffb4be49a320ff55dfab

diff --git a/tox.ini b/tox.ini
index 0ee4dbd9e852fa3ddcc1d0ca52437f6735ada278..9c4b6881e00efc1362c9737c6da0ea0071789875 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -47,21 +47,21 @@ setenv=
     PYTHONNOUSERSITE=1
     BASECOMMAND=python -m pytest
 
-    WORKERS=-n4
-    oracle: 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=--db sqlite
-    postgresql: POSTGRESQL=--db postgresql
-    mysql: MYSQL=--db mysql --db pymysql
-    oracle: ORACLE=--db oracle --write-idents oracle_idents.txt
-    mssql: 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
+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=