Commit c64e34e
committed
Rename NUnit vars to generic names
Makes it easier to switch test-runners in the future.
Note the if section is being skipped for NUnit3, but leaving it
in case needed to rollback to NUnit2, or upgrade to XUnit1 parent 4ecde5b commit c64e34e
2 files changed
Lines changed: 14 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -10,7 +10,6 @@ environment: | |||
| 10 | 10 | PYTHONUNBUFFERED: True | |
| 11 | 11 | PYTHONWARNINGS: 'ignore:::wheel.pep425tags:' | |
| 12 | 12 | PYTHONPATH: C:\testdir | |
| 13 | - NUNIT: nunit3-console | ||
| 14 | 13 | CONDA_BLD: C:\miniconda35 | |
| 15 | 14 | ||
| 16 | 15 | matrix: | |
@@ -29,7 +28,6 @@ init: | |||
| 29 | 28 | - set CONDA_BLD_ARCH=%PLATFORM:x=% | |
| 30 | 29 | - set PYTHON=C:\PYTHON%PYTHON_VERSION:.=% | |
| 31 | 30 | - if %PLATFORM%==x86 (set CONDA_BLD_ARCH=32) | |
| 32 | - # - if %PLATFORM%==x86 (set NUNIT=%NUNIT%-x86) | ||
| 33 | 31 | - if %PLATFORM%==x64 (set PYTHON=%PYTHON%-x64) | |
| 34 | 32 | - if %PLATFORM%==x64 (set CONDA_BLD=%CONDA_BLD%-x64) | |
| 35 | 33 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,9 +1,17 @@ | |||
| 1 | - # Script to simplify appveyor configuration and resolve path to tools | ||
| 1 | + # Script to simplify AppVeyor configuration and resolve path to tools | ||
| 2 | + | ||
| 3 | + # Test Runner framework being used for embedded tests | ||
| 4 | + $CS_RUNNER = "nunit3-console" | ||
| 5 | + | ||
| 6 | + # Needed for ARCH specific runners(NUnit2/XUnit3). Skip for NUnit3 | ||
| 7 | + if ($FALSE -and $env:PLATFORM -eq "x86"){ | ||
| 8 | + $CS_RUNNER = $CS_RUNNER + "-x86" | ||
| 9 | + } | ||
| 2 | 10 | ||
| 3 | 11 | # Executable paths for OpenCover | |
| 4 | 12 | # Note if OpenCover fails, it won't affect the exit codes. | |
| 5 | 13 | $OPENCOVER = Resolve-Path .\packages\OpenCover.*\tools\OpenCover.Console.exe | |
| 6 | - $NUNIT = Resolve-Path .\packages\NUnit.*\tools\"$env:NUNIT".exe | ||
| 14 | + $CS_RUNNER = Resolve-Path .\packages\NUnit.*\tools\"$CS_RUNNER".exe | ||
| 7 | 15 | $PY = Get-Command python | |
| 8 | 16 | ||
| 9 | 17 | # Can't use ".\build\*\Python.EmbeddingTest.dll". Missing framework files. | |
@@ -27,16 +35,16 @@ if ($PYTHON_STATUS -ne 0) { | |||
| 27 | 35 | # Powershell options splatting: http://stackoverflow.com/a/24313253/5208670 | |
| 28 | 36 | Write-Host ("Starting embedded tests") -ForegroundColor "Green" | |
| 29 | 37 | .$OPENCOVER -register:user -searchdirs:"$RUNTIME_DIR" -output:cs.coverage ` | |
| 30 | - -target:"$NUNIT" -targetargs:"$CS_TESTS" ` | ||
| 38 | + -target:"$CS_RUNNER" -targetargs:"$CS_TESTS" ` | ||
| 31 | 39 | -filter:"+[*]Python.Runtime*" ` | |
| 32 | 40 | -returntargetcode | |
| 33 | - $NUNIT_STATUS = $LastExitCode | ||
| 34 | - if ($NUNIT_STATUS -ne 0) { | ||
| 41 | + $CS_STATUS = $LastExitCode | ||
| 42 | + if ($CS_STATUS -ne 0) { | ||
| 35 | 43 | Write-Host "Embedded tests failed" -ForegroundColor "Red" | |
| 36 | 44 | } | |
| 37 | 45 | ||
| 38 | 46 | # Set exit code to fail if either Python or Embedded tests failed | |
| 39 | - if ($PYTHON_STATUS -ne 0 -or $NUNIT_STATUS -ne 0) { | ||
| 47 | + if ($PYTHON_STATUS -ne 0 -or $CS_STATUS -ne 0) { | ||
| 40 | 48 | Write-Host "Tests failed" -ForegroundColor "Red" | |
| 41 | 49 | $host.SetShouldExit(1) | |
| 42 | 50 | } | |
0 commit comments