[Piglit] [PATCH 5/5] tox.ini: compress tox file to be simpler

[baker.dylan.c at gmail.com]

From: Dylan Baker <baker.dylan.c at gmail.com>

Instead of having a bunch of different testenv sections, use one with
some compressed dependencies.

Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
 tox.ini | 34 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/tox.ini b/tox.ini
index 663b38f..81cdbcc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,32 +1,20 @@
 [tox]
-envlist = py27-{noaccel,accel},py{27,33,34,35}
+envlist = py27-{noaccel,accel},py{27,33,34,35}-generator
 skipsdist=True
 
-[testenv]
-deps =
-    mako
-    numpy
-    six
-    nose
-commands = nosetests generated_tests/test_generators.py
 
-[testenv:py27-noaccel]
-passenv=HOME
-deps =
-    mako
-    nose
-    coverage
-    mock
-commands = nosetests unittests --cover-package=framework --cover-tests
-
-[testenv:py27-accel]
+[testenv]
 passenv=HOME
 deps =
     mako
     nose
     coverage
-    mock
-    simplejson
-    lxml
-    backports.lzma
-commands = nosetests unittests --with-cover --cover-package=framework --cover-tests
+    {accel,noaccel}: mock
+    accel: simplejson
+    accel: lxml
+    accel: backports.lzma
+    generator: six
+    generator: numpy
+commands = 
+    {accel,noaccel}: nosetests unittests --with-cover --cover-package=framework --cover-tests
+    generator: nosetests generated_tests/test_generators.py
-- 
2.6.4