Refactor AppVeyor/Travis embedded test_runner

vmuriart · vmuriart · commit a5d325f79d59 · 2017-02-13T14:46:17.000-07:00
Make it easier to diff and upgrade versions by breaking into multiple lines and using path completion Powershell continuation: http://stackoverflow.com/a/2608186/5208670 Powershell options splatting: http://stackoverflow.com/a/24313253/5208670
diff --git a/.travis.yml b/.travis.yml
@@ -35,7 +35,7 @@ install:
 script:
   - export PYTHONPATH=`pwd`:$PYTHONPATH
   - python src/tests/runtests.py
-  # - mono ./packages/NUnit.Runners*/tools/nunit-console.exe src/embed_tests/bin/Python.EmbeddingTest.dll
+  # - mono ./packages/NUnit.*/tools/nunit-console.exe src/embed_tests/bin/Python.EmbeddingTest.dll
 
 after_success:
   # Uncomment if need to geninterop, ie. py37 final
diff --git a/ci/appveyor_run_tests.ps1 b/ci/appveyor_run_tests.ps1
@@ -3,7 +3,7 @@
 # Executable paths for OpenCover
 # Note if OpenCover fails, it won't affect the exit codes.
 $OPENCOVER = Resolve-Path .\packages\OpenCover.*\tools\OpenCover.Console.exe
-$NUNIT = Resolve-Path .\packages\NUnit.Runners*\tools\"$env:NUNIT".exe
+$NUNIT = Resolve-Path .\packages\NUnit.*\tools\"$env:NUNIT".exe
 $PY = Get-Command python
 
 # Can't use ".\build\*\Python.EmbeddingTest.dll". Missing framework files.
@@ -13,15 +13,22 @@ $RUNTIME_DIR = ".\src\runtime\bin\"
 # Run python tests with C# coverage
 # why `2>&1 | %{ "$_" }`? see: http://stackoverflow.com/a/20950421/5208670
 Write-Host ("Starting Python tests") -ForegroundColor "Green"
-.$OPENCOVER -register:user -searchdirs:"$RUNTIME_DIR" -output:py.coverage -target:"$PY" -targetargs:src\tests\runtests.py -returntargetcode 2>&1 | %{ "$_" }
+.$OPENCOVER -register:user -searchdirs:"$RUNTIME_DIR" -output:py.coverage `
+            -target:"$PY" -targetargs:src\tests\runtests.py `
+            -returntargetcode `
+            2>&1 | %{ "$_" }
 $PYTHON_STATUS = $LastExitCode
 if ($PYTHON_STATUS -ne 0) {
     Write-Host "Python tests failed, continuing to embedded tests" -ForegroundColor "Red"
 }
 
 # Run Embedded tests with C# coverage
+# Powershell continuation: http://stackoverflow.com/a/2608186/5208670
+# Powershell options splatting: http://stackoverflow.com/a/24313253/5208670
 Write-Host ("Starting embedded tests") -ForegroundColor "Green"
-.$OPENCOVER -register:user -searchdirs:"$RUNTIME_DIR" -output:cs.coverage -target:"$NUNIT" -targetargs:"$CS_TESTS" -returntargetcode
+.$OPENCOVER -register:user -searchdirs:"$RUNTIME_DIR" -output:cs.coverage `
+            -target:"$NUNIT" -targetargs:"$CS_TESTS" `
+            -returntargetcode
 $NUNIT_STATUS = $LastExitCode
 if ($NUNIT_STATUS -ne 0) {
     Write-Host "Embedded tests failed" -ForegroundColor "Red"
