Allow running tox on windows too.

orientalperil · Feb 15, 2015 · b1c1ac6 · b1c1ac6
1 parent f2dedb3
commit b1c1ac6
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 24 deletions.
diff --git a/ci/templates/tox.ini b/ci/templates/tox.ini
@@ -9,5 +9,5 @@ deps =
     tox==1.8.1
 commands =
 {% for env, config in tox_environments|dictsort %}
-    {toxinidir}/ci/test.sh {{ env }}
+    {toxinidir}/ci/test.cmd {{ env }}
 {% endfor %}
diff --git a/ci/test.cmd b/ci/test.cmd
@@ -0,0 +1,11 @@
+#!/bin/bash -eE
+:<<"::batch"
+@echo off
+powershell -ExecutionPolicy ByPass -File ci\test.ps1 %*
+goto :end
+::batch
+ci\test.sh $*
+exit $?
+:<<"::done"
+:end
+::done
diff --git a/ci/test.ps1 b/ci/test.ps1
@@ -1,5 +1,5 @@
 param (
-    [string]$target
+    [string]$target=$(throw "Usage: {0} env-name" -f $MyInvocation.MyCommand.Name)
 )
 write-host "================================" -foregroundcolor "magenta"
 write-host "================================ Testing: $target" -foregroundcolor "magenta"

diff --git a/tox.ini b/tox.ini
@@ -8,25 +8,25 @@ deps =
     bumpversion==0.5.1
     tox==1.8.1
 commands =
-    {toxinidir}/ci/test.sh matrix
-    {toxinidir}/ci/test.sh matrix-cext
-    {toxinidir}/ci/test.sh matrix-cext-optional
-    {toxinidir}/ci/test.sh matrix-fnaccents
-    {toxinidir}/ci/test.sh matrix-fndoublequote
-    {toxinidir}/ci/test.sh matrix-fnquote
-    {toxinidir}/ci/test.sh matrix-fntriplequote
-    {toxinidir}/ci/test.sh matrix-pnaccents
-    {toxinidir}/ci/test.sh matrix-pndoublequote
-    {toxinidir}/ci/test.sh matrix-pnquote
-    {toxinidir}/ci/test.sh matrix-pntriplequote
-    {toxinidir}/ci/test.sh plain
-    {toxinidir}/ci/test.sh plain-cext
-    {toxinidir}/ci/test.sh plain-cext-optional
-    {toxinidir}/ci/test.sh plain-fnaccents
-    {toxinidir}/ci/test.sh plain-fndoublequote
-    {toxinidir}/ci/test.sh plain-fnquote
-    {toxinidir}/ci/test.sh plain-fntriplequote
-    {toxinidir}/ci/test.sh plain-pnaccents
-    {toxinidir}/ci/test.sh plain-pndoublequote
-    {toxinidir}/ci/test.sh plain-pnquote
-    {toxinidir}/ci/test.sh plain-pntriplequote
+    {toxinidir}/ci/test.cmd matrix
+    {toxinidir}/ci/test.cmd matrix-cext
+    {toxinidir}/ci/test.cmd matrix-cext-optional
+    {toxinidir}/ci/test.cmd matrix-fnaccents
+    {toxinidir}/ci/test.cmd matrix-fndoublequote
+    {toxinidir}/ci/test.cmd matrix-fnquote
+    {toxinidir}/ci/test.cmd matrix-fntriplequote
+    {toxinidir}/ci/test.cmd matrix-pnaccents
+    {toxinidir}/ci/test.cmd matrix-pndoublequote
+    {toxinidir}/ci/test.cmd matrix-pnquote
+    {toxinidir}/ci/test.cmd matrix-pntriplequote
+    {toxinidir}/ci/test.cmd plain
+    {toxinidir}/ci/test.cmd plain-cext
+    {toxinidir}/ci/test.cmd plain-cext-optional
+    {toxinidir}/ci/test.cmd plain-fnaccents
+    {toxinidir}/ci/test.cmd plain-fndoublequote
+    {toxinidir}/ci/test.cmd plain-fnquote
+    {toxinidir}/ci/test.cmd plain-fntriplequote
+    {toxinidir}/ci/test.cmd plain-pnaccents
+    {toxinidir}/ci/test.cmd plain-pndoublequote
+    {toxinidir}/ci/test.cmd plain-pnquote
+    {toxinidir}/ci/test.cmd plain-pntriplequote