From 023939b627b7dc93b01471f7d41fb8553ddb4ffa Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 30 May 2024 05:59:24 +0200 Subject: Merging upstream version 1.73.0+dfsg1. Signed-off-by: Daniel Baumann --- vendor/vcpkg/tests/README.md | 5 ----- vendor/vcpkg/tests/run.sh | 20 -------------------- vendor/vcpkg/tests/vcpkgrs_target.sh | 22 ---------------------- 3 files changed, 47 deletions(-) delete mode 100644 vendor/vcpkg/tests/README.md delete mode 100644 vendor/vcpkg/tests/run.sh delete mode 100644 vendor/vcpkg/tests/vcpkgrs_target.sh (limited to 'vendor/vcpkg/tests') diff --git a/vendor/vcpkg/tests/README.md b/vendor/vcpkg/tests/README.md deleted file mode 100644 index 56a73b1a3..000000000 --- a/vendor/vcpkg/tests/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# individual library tests - -These tests should have the same name as the vcpkg port. They are intended to use to verify that building/linking/running is possible on each platform. - -The systests are intended to test that the current version of the vcpkg build helper will work with published versions of the most common -sys crates. \ No newline at end of file diff --git a/vendor/vcpkg/tests/run.sh b/vendor/vcpkg/tests/run.sh deleted file mode 100644 index b9dcdb369..000000000 --- a/vendor/vcpkg/tests/run.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -set -ex - -SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -cd $SCRIPTDIR - -export VCPKG_ROOT=$SCRIPTDIR/../vcp - -source ../setup_vcp.sh - -for port in harfbuzz ; do - # check that the port fails before it is installed - $VCPKG_ROOT/vcpkg remove $port || true - cargo clean --manifest-path $port/Cargo.toml - cargo run --manifest-path $port/Cargo.toml && exit 2 - echo THIS FAILURE IS EXPECTED - echo This is to ensure that we are not spuriously succeeding because the libraries already exist somewhere on the build machine. - $VCPKG_ROOT/vcpkg install $port - cargo run --manifest-path $port/Cargo.toml -done diff --git a/vendor/vcpkg/tests/vcpkgrs_target.sh b/vendor/vcpkg/tests/vcpkgrs_target.sh deleted file mode 100644 index ba46fbf35..000000000 --- a/vendor/vcpkg/tests/vcpkgrs_target.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -set -ex - -SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -cd $SCRIPTDIR - -export VCPKG_ROOT=$SCRIPTDIR/../vcp -export VCPKGRS_TRIPLET=test-triplet -export VCPKG_DEFAULT_TRIPLET=test-triplet - -cp $VCPKG_ROOT/triplets/x64-linux.cmake $VCPKG_ROOT/triplets/test-triplet.cmake -for port in harfbuzz ; do - # check that the port fails before it is installed - $VCPKG_ROOT/vcpkg remove --no-binarycaching $port || true - cargo clean --manifest-path $port/Cargo.toml - cargo run --manifest-path $port/Cargo.toml && exit 2 - echo THIS FAILURE IS EXPECTED - echo This is to ensure that we are not spuriously succeeding because the libraries already exist somewhere on the build machine. - # disable binary caching because it breaks this build as of vcpkg 53e6588 (since vcpkg 52a9d9a) - $VCPKG_ROOT/vcpkg install --no-binarycaching $port - cargo run --manifest-path $port/Cargo.toml -done -- cgit v1.2.3