diff --git a/tests/gold_tests/autest-site/conditions.test.ext b/tests/gold_tests/autest-site/conditions.test.ext index 35aaa6abc3d..35d7d1bc907 100644 --- a/tests/gold_tests/autest-site/conditions.test.ext +++ b/tests/gold_tests/autest-site/conditions.test.ext @@ -67,7 +67,8 @@ def HasCurlVersion(self, version): def HasProxyVerifierVersion(self, version): - return self.EnsureVersion(["verifier-client", "--version"], min_version=version) + verifier_path = os.path.join(self.Variables.VerifierBinPath, 'verifier-client') + return self.EnsureVersion([verifier_path, "--version"], min_version=version) def HasCurlFeature(self, feature): @@ -130,6 +131,7 @@ def PluginExists(self, pluginname): ExtendCondition(HasOpenSSLVersion) +ExtendCondition(HasProxyVerifierVersion) ExtendCondition(IsBoringSSL) ExtendCondition(IsOpenSSL) ExtendCondition(HasATSFeature) diff --git a/tests/prepare_proxy_verifier.sh b/tests/prepare_proxy_verifier.sh index 2c34df74006..7182d8b97a6 100755 --- a/tests/prepare_proxy_verifier.sh +++ b/tests/prepare_proxy_verifier.sh @@ -40,7 +40,7 @@ pv_dir="${pv_name}-${pv_version}" pv_tar_filename="${pv_dir}.tar.gz" pv_tar="${pv_top_dir}/${pv_tar_filename}" pv_tar_url="https://ci.trafficserver.apache.org/bintray/${pv_tar_filename}" -expected_sha1="011bd50b74a07484683ed56a671f37afbdd0c786" +expected_sha1="0f189a37596d7488b5b81b5547df6fc1eadf56a1" pv_client="${bin_dir}/verifier-client" pv_server="${bin_dir}/verifier-server" TAR=${TAR:-tar} @@ -78,10 +78,10 @@ EOF Darwin) case $(uname -m) in x86_64) - pv_os_dir="${pv_unpack_dir}/${pv_dir}/mac-x86_64" + pv_os_dir="${pv_unpack_dir}/${pv_dir}/darwin-amd64" ;; arm64) - pv_os_dir="${pv_unpack_dir}/${pv_dir}/mac-m1" + pv_os_dir="${pv_unpack_dir}/${pv_dir}/darwin-arm64" ;; *) fail "Unrecognized Mac architecture: $(uname -m)" @@ -90,6 +90,17 @@ EOF ;; Linux) pv_os_dir="${pv_unpack_dir}/${pv_dir}/linux" + case $(uname -m) in + x86_64) + pv_os_dir="${pv_unpack_dir}/${pv_dir}/linux-amd64" + ;; + aarch64) + pv_os_dir="${pv_unpack_dir}/${pv_dir}/linux-arm64" + ;; + *) + fail "Unrecognized Linux architecture: $(uname -m)" + ;; + esac ;; *) fail "We need to build proxy-verifier for $(uname -s)" diff --git a/tests/proxy-verifier-version.txt b/tests/proxy-verifier-version.txt index 8a965c11682..c0151c8a568 100644 --- a/tests/proxy-verifier-version.txt +++ b/tests/proxy-verifier-version.txt @@ -1 +1 @@ -v2.6.0 +v2.10.1