Skip to content

Commit 5d33222

Browse files
committed
Fix ci test changing VCPKG_ROOT/installed
1 parent 74b2641 commit 5d33222

File tree

1 file changed

+3
-1
lines changed
  • azure-pipelines/end-to-end-tests-dir

1 file changed

+3
-1
lines changed

azure-pipelines/end-to-end-tests-dir/ci.ps1

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,12 @@ if (-not ($Output.Contains("vcpkg.json:3:17: error: Trailing comma"))) {
6262
}
6363

6464
# test that file conflicts are detected
65+
Remove-Item -Recurse -Force $installRoot -ErrorAction SilentlyContinue
66+
New-Item -ItemType Directory -Path $installRoot -Force | Out-Null
6567
Remove-Problem-Matchers
6668
$emptyDir = "$TestingRoot/empty"
6769
New-Item -ItemType Directory -Path $emptyDir -Force | Out-Null
68-
$Output = Run-VcpkgAndCaptureOutput ci --triplet=$Triplet --x-builtin-ports-root="$emptyDir" --binarysource=clear --overlay-ports="$PSScriptRoot/../e2e-ports/duplicate-file-a" --overlay-ports="$PSScriptRoot/../e2e-ports/duplicate-file-b"
70+
$Output = Run-VcpkgAndCaptureOutput ci @commonArgs --x-builtin-ports-root="$emptyDir" --binarysource=clear --overlay-ports="$PSScriptRoot/../e2e-ports/duplicate-file-a" --overlay-ports="$PSScriptRoot/../e2e-ports/duplicate-file-b"
6971
Throw-IfNotFailed
7072
Restore-Problem-Matchers
7173

0 commit comments

Comments
 (0)