diff --git a/appveyor.yml b/appveyor.yml index 2795a94f8..fd5822ac9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,6 +10,7 @@ environment: PYTHONUNBUFFERED: True PYTHONWARNINGS: 'ignore:::wheel.pep425tags:' PYTHONPATH: C:\testdir + NUNIT: nunit-console CONDA_BLD: C:\conda CONDA_BLD_VERSION: 3.5 @@ -34,6 +35,7 @@ init: - set CONDA_BLD_ARCH=%PLATFORM:x=% - set PYTHON=C:\PYTHON%PYTHON_VERSION:.=% - if %PLATFORM%==x86 (set CONDA_BLD_ARCH=32) + - if %PLATFORM%==x86 (set NUNIT=%NUNIT%-x86) - if %PLATFORM%==x64 (set PYTHON=%PYTHON%-x64) # Prepend newly installed Python to the PATH of this build diff --git a/ci/appveyor_run_tests.ps1 b/ci/appveyor_run_tests.ps1 index 3a7d25af8..78bae50b9 100644 --- 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.ConsoleRunner*\tools\nunit3-console.exe +$NUNIT = Resolve-Path .\packages\NUnit.Runners*\tools\"$env:NUNIT".exe $PY = Get-Command python # Can't use ".\build\*\Python.EmbeddingTest.dll". Missing framework files. @@ -19,11 +19,11 @@ if ($PYTHON_STATUS -ne 0) { } # Run Embedded tests with C# coverage -# .$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" -# } +.$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" +} # Embedded tests failing due to open issues, pass/fail only on Python exit code # if ($PYTHON_STATUS -ne 0 -or $NUNIT_STATUS -ne 0) { diff --git a/src/embed_tests/Python.EmbeddingTest.csproj b/src/embed_tests/Python.EmbeddingTest.csproj index 7e083d5e0..c9586cf4a 100644 --- a/src/embed_tests/Python.EmbeddingTest.csproj +++ b/src/embed_tests/Python.EmbeddingTest.csproj @@ -150,9 +150,8 @@ prompt - - ..\..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll - True + + ..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll diff --git a/src/embed_tests/packages.config b/src/embed_tests/packages.config index 8ab5202ce..33152fe85 100644 --- a/src/embed_tests/packages.config +++ b/src/embed_tests/packages.config @@ -1,5 +1,5 @@ - - + +