diff --git a/appveyor.yml b/appveyor.yml index 32d9fb65..22cf81a9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -179,7 +179,7 @@ test_script: If ($env:SQL_INSTANCE -Match "SQL2016") { "Running phpt tests via OpenCppCoverage..." $ext_dir = ${env:PHP_SDK_DIR} + "\php-" + ${env:PHP_VERSION} + "-src\ext"; - cd ${env:PHP_INSTALL_DIR}\ext + cd ext OpenCppCoverage.exe --sources $ext_dir\pdo_sqlsrv --sources $ext_dir\sqlsrv --modules *sqlsrv*.dll --export_type=cobertura:${env:PHP_INSTALL_DIR}\coverage.xml --cover_children --quiet --continue_after_cpp_exception --optimized_build -- ..\php.exe ..\run-tests.php -P ${env:APPVEYOR_BUILD_FOLDER}\test\functional\ > ${env:APPVEYOR_BUILD_FOLDER}\test\functional\sqlsrvtests.log 2>&1; type ${env:APPVEYOR_BUILD_FOLDER}\test\functional\sqlsrvtests.log; cd .. @@ -205,31 +205,27 @@ test_script: after_test: - cd %APPVEYOR_BUILD_FOLDER%\test\functional\ + - ps: ls *.log - python output.py - ps: $difffiles = Get-ChildItem sqlsrv\*.diff - ps: $outfiles = Get-ChildItem sqlsrv\*.out - ps: foreach($file in $difffiles){ls $file; more $file} - ps: foreach($file in $outfiles){ls $file; more $file} - - ps: $difffiles = Get-ChildItem pdo_sqlsrv\*.diff - - ps: $outfiles = Get-ChildItem pdo_sqlsrv\*.out - - ps: foreach($file in $difffiles){ls $file; more $file} - - ps: foreach($file in $outfiles){ls $file; more $file} + - ps: $diff2files = Get-ChildItem pdo_sqlsrv\*.diff + - ps: $out2files = Get-ChildItem pdo_sqlsrv\*.out + - ps: foreach($file in $diff2files){ls $file; more $file} + - ps: foreach($file in $out2files){ls $file; more $file} #- cd %APPVEYOR_BUILD_FOLDER%\test\functional\ # there is only one xml file if running tests with coverage analysis - ps: (new-object net.webclient).UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\nativeresult1.xml)) - - ps: [xml]$results = Get-Content nativeresult1.xml; + - ps: [xml]$results = Get-Content nativeresult1.xml ; - ps: $result2Exists = Test-Path "nativeresult2.xml" - - ps: $failure = $results.SelectSingleNode("//failure"); - - ps: $failure2 = $null - ps: >- If ($result2Exists -eq $true) { (new-object net.webclient).UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\nativeresult2.xml)); - [xml]$results2 = Get-Content nativeresult2.xml; - $failure2 = $results2.SelectSingleNode("//failure"); } - ps: >- - if ($failure -ne $null -Or $failure2 -ne $null) - { + If ($difffiles -ne $null -Or $diff2files -ne $null) { $host.SetShouldExit(1); Write-Host "Forcing build failure due to phpt unit test failure(s)"; }