Fix hash-addtional-files tests (#1388)

Problems were: - the only test in e2e_ports folder, everything else in e2e-ports - tests modify files under $VCPKG_ROOT - Divided in two files where one enough - Tests fail if package is already in binary cache
microsoft · Apr 20, 2024 · 7b0cdcf · 7b0cdcf
1 parent 1603ecb
commit 7b0cdcf
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 8 deletions.
diff --git a/...h-additional-fail/additional_abi_file.txt → ...h-additional-fail/additional_abi_file.txt b/...h-additional-fail/additional_abi_file.txt → ...h-additional-fail/additional_abi_file.txt
diff --git a/...additional-fail/hash-additional-e2e.cmake → ...additional-fail/hash-additional-e2e.cmake b/...additional-fail/hash-additional-e2e.cmake → ...additional-fail/hash-additional-e2e.cmake
diff --git a/...vcpkg-test-hash-additional/portfile.cmake → ...vcpkg-test-hash-additional/portfile.cmake b/...vcpkg-test-hash-additional/portfile.cmake → ...vcpkg-test-hash-additional/portfile.cmake
diff --git a/...ail/vcpkg-test-hash-additional/vcpkg.json → ...ail/vcpkg-test-hash-additional/vcpkg.json b/...ail/vcpkg-test-hash-additional/vcpkg.json → ...ail/vcpkg-test-hash-additional/vcpkg.json
diff --git a/...s/hash-additional/additional_abi_file.txt → ...s/hash-additional/additional_abi_file.txt b/...s/hash-additional/additional_abi_file.txt → ...s/hash-additional/additional_abi_file.txt
diff --git a/...hash-additional/hash-additional-e2e.cmake → ...hash-additional/hash-additional-e2e.cmake b/...hash-additional/hash-additional-e2e.cmake → ...hash-additional/hash-additional-e2e.cmake
diff --git a/...vcpkg-test-hash-additional/portfile.cmake → ...vcpkg-test-hash-additional/portfile.cmake b/...vcpkg-test-hash-additional/portfile.cmake → ...vcpkg-test-hash-additional/portfile.cmake
diff --git a/...nal/vcpkg-test-hash-additional/vcpkg.json → ...nal/vcpkg-test-hash-additional/vcpkg.json b/...nal/vcpkg-test-hash-additional/vcpkg.json → ...nal/vcpkg-test-hash-additional/vcpkg.json
diff --git a/azure-pipelines/end-to-end-tests-dir/hash-additional-fail.ps1 b/azure-pipelines/end-to-end-tests-dir/hash-additional-fail.ps1
diff --git a/azure-pipelines/end-to-end-tests-dir/hash-additional.ps1 b/azure-pipelines/end-to-end-tests-dir/hash-additional.ps1
@@ -1,3 +1,11 @@
 . $PSScriptRoot/../end-to-end-tests-prelude.ps1
-Run-Vcpkg "--overlay-triplets=$PSScriptRoot/../e2e_ports/hash-additional" "--overlay-ports=$PSScriptRoot/../e2e_ports/hash-additional" install vcpkg-test-hash-additional --triplet hash-additional-e2e 
+
+Run-Vcpkg @directoryArgs "--overlay-triplets=$PSScriptRoot/../e2e-ports/hash-additional" "--overlay-ports=$PSScriptRoot/../e2e-ports/hash-additional" x-set-installed vcpkg-test-hash-additional --triplet hash-additional-e2e --binarysource=clear
 Throw-IfFailed
+
+$output = Run-VcpkgAndCaptureOutput @directoryArgs "--overlay-triplets=$PSScriptRoot/../e2e-ports/hash-additional-fail" "--overlay-ports=$PSScriptRoot/../e2e-ports/hash-additional-fail" x-set-installed vcpkg-test-hash-additional --triplet hash-additional-e2e --binarysource=clear
+Throw-IfNotFailed
+if ($output -notmatch "Variable VCPKG_HASH_ADDITIONAL_FILES contains invalid file path")
+{
+    throw "Expected to fail since VCPKG_HASH_ADDITIONAL_FILES is set to a relative path"
+}