@@ -22,7 +22,9 @@ $configurations = @("Debug", "Release")
2222# Locate Dvl.exe: prefer the copy shipped inside the WDK NuGet package so that
2323# the test works in CI environments that have the NuGet packages restored but no
2424# system-wide WDK installation. Fall back to the traditional WDK install path
25- # for developer machines that have the full WDK installed.
25+ # for developer machines that have the full WDK installed. If Dvl.exe cannot be
26+ # found in either location the test fails -- the dvl command-type tests are
27+ # required and silently skipping them would let regressions slip through.
2628$dvl_exe_path = " C:\Program Files (x86)\Windows Kits\10\Tools\dvl\Dvl.exe"
2729$nuget_dvl = Get-ChildItem - Path " $starting_location \packages" - Filter " Dvl.exe" `
2830 - Recurse - ErrorAction SilentlyContinue | Select-Object - First 1
@@ -32,8 +34,8 @@ if ($nuget_dvl) {
3234} elseif (Test-Path $dvl_exe_path ) {
3335 Write-Host " Using Dvl.exe from system WDK: $dvl_exe_path "
3436} else {
35- Write-Host " WARNING: Dvl.exe not found in NuGet packages or system WDK. 'dvl' command-type tests will be skipped ."
36- $dvl_exe_path = $null
37+ Write-Host " FAIL -- Dvl.exe not found in NuGet packages ( $starting_location \packages) or system WDK ( $dvl_exe_path ) ."
38+ exit 1
3739}
3840function Test-DVL {
3941 param (
@@ -102,11 +104,6 @@ function Test-DVL {
102104 $global :LASTEXITCODE = 1234567891
103105 if ($command_type -eq " dvl" ) {
104106 if ($configuration -eq " Release" ) {
105- if (-not $dvl_exe_path ) {
106- Write-Host " SKIP -- Dvl.exe not available; skipping dvl command-type test for $platform $configuration "
107- continue
108- }
109-
110107 $command = " & `" $dvl_exe_path `" /manualCreate $vcxproj_name $platform "
111108 $output = Invoke-Expression $command
112109 if ($LastExitCode -eq 1234567891 ) {
0 commit comments