Remove the vcpkg-find-acquire-program test port. (#1130)

Hopefully resolves test failures in https://github.com/microsoft/vcpkg-tool/pull/1129 -- asset caching is not turned on in the tool repo so testing things that need lots of external servers is problematic.

This was added back when the tool and registry were in the same repo in attempt to validate *registry* changes, not tool changes. As a result it doesn't really belong here.

The one thing that might also have been tested here is handling of old CONTROL files ports so I added an explicit test port for that.
This commit is contained in:
Billy O'Neal 2023-07-17 13:45:41 -07:00 коммит произвёл GitHub
Родитель da079bd164
Коммит 7873dc4e91
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
5 изменённых файлов: 7 добавлений и 30 удалений

Просмотреть файл

@ -0,0 +1,4 @@
Source: control-file
Version: 0
Description: Test port using old-style CONTROL file
Supports: windows | !windows

Просмотреть файл

@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

Просмотреть файл

@ -1,4 +0,0 @@
Source: vcpkg-find-acquire-program
Version: 0
Description: Test port to exercise vcpkg_find_acquire_program
Supports: windows

Просмотреть файл

@ -1,21 +0,0 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
if(CMAKE_HOST_WIN32)
foreach(PROG GO JOM NASM PERL YASM GIT PYTHON3 PYTHON2 RUBY 7Z NUGET FLEX BISON GPERF GASPREPROCESSOR DARK SCONS SWIG DOXYGEN ARIA2 PKGCONFIG)
vcpkg_find_acquire_program(${PROG})
foreach(SUBPROG IN LISTS ${PROG})
if(NOT EXISTS "${SUBPROG}")
message(FATAL_ERROR "Program ${SUBPROG} did not exist.")
endif()
endforeach()
endforeach()
endif()
foreach(PROG GN NINJA MESON BAZEL)
vcpkg_find_acquire_program(${PROG})
foreach(SUBPROG IN LISTS ${PROG})
if(NOT EXISTS "${SUBPROG}")
message(FATAL_ERROR "Program ${SUBPROG} did not exist.")
endif()
endforeach()
endforeach()

Просмотреть файл

@ -15,11 +15,8 @@ Run-Vcpkg @commonArgs --overlay-ports="$PSScriptRoot/../e2e-ports/overlays" inst
Throw-IfFailed
Run-Vcpkg @commonArgs --overlay-ports="$PSScriptRoot/../e2e-ports" install vcpkg-internal-e2e-test-port
Throw-IfFailed
if ($IsWindows) {
Run-Vcpkg @commonArgs --overlay-ports="$PSScriptRoot/../e2e-ports" install vcpkg-find-acquire-program
Throw-IfFailed
}
Run-Vcpkg @commonArgs --overlay-ports="$PSScriptRoot/../e2e-ports" install control-file
Throw-IfFailed
$output = Run-VcpkgAndCaptureOutput @commonArgs --overlay-ports="$PSScriptRoot/../e2e-ports/overlays" install broken-no-name
Throw-IfNotFailed
if ($output -notmatch "missing required field 'name'") {