X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=tox.ini;h=216f8901d5cd86257d62ed19fe43a21b10711d10;hb=b8363472c1306d0c704a46f028cff95d945a2133;hp=e634cdfe660e584196d0a080a0926823152d3419;hpb=26ca2f53d8fe333bb2448ea412e82be415cb3fd2;p=sqlconvert.git

diff --git a/tox.ini b/tox.ini
index e634cdf..216f890 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,6 @@
 [tox]
 minversion = 1.8
+toxworkdir={homedir}/.tox/sqlconvert
 envlist = {py26,py27,py34},{py26,py27,py34}-{postgres,sqlite},{py27,py34}-flake8
 
 # Base test environment settings
@@ -11,8 +12,8 @@ deps =
     py26: argparse
     py26,py27: SQLObject>=2.2.1
     py34: SQLObject>=3.0.0
-    py26,py27: m_lib>=2.0
-    py34: m_lib>=3.0
+    m_lib>=3.1
+    m_lib.defenc>=1.0
     postgres: psycopg2
 sitepackages = True
 # Don't fail or warn on uninstalled commands
@@ -20,11 +21,15 @@ whitelist_externals =
     flake8
     createdb
     dropdb
+    cmp
     rm
 
 [general]
 commands =
     python -m pytest --cov=sqlconvert
+    mysql2sql demo/demo.sql test.out
+    cmp -s tests/mysql2sql/test.out test.out
+    rm test.out
 
 [testenv:py26]
 commands = {[general]commands}
@@ -38,8 +43,9 @@ commands = {[general]commands}
 # PostgreSQL test environments
 [postgresql]
 commands =
+    -dropdb test
     createdb test
-    python -m pytest -D postgres:///test
+    python -m pytest --cov=sqlconvert -D postgres:///test
     dropdb test
 
 [testenv:py26-postgres]
@@ -54,7 +60,7 @@ commands = {[postgresql]commands}
 # SQLite test environments
 [sqlite]
 commands =
-    python -m pytest -D sqlite:///tmp/test.sqdb
+    python -m pytest --cov=sqlconvert -D sqlite:///tmp/test.sqdb
     rm -f /tmp/test.sqdb
 
 [testenv:py26-sqlite]