aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorBilly O'Neal <bion@microsoft.com>2021-01-14 08:41:53 -0800
committerGitHub <noreply@github.com>2021-01-14 08:41:53 -0800
commit3f3d9a615a4f86ce892613885f00ca315cfe1e7e (patch)
treea6324a9596ca5f8f75ec1cb462e20190883dbdcd /scripts
parentfd67439f01bfec989f7b1505f3b2f10f771470a3 (diff)
downloadvcpkg-3f3d9a615a4f86ce892613885f00ca315cfe1e7e.tar.gz
vcpkg-3f3d9a615a4f86ce892613885f00ca315cfe1e7e.zip
[vcpkg] Fix incorrect handling of messages for permenantly disabled metrics. (#15636)
Fixes #15630
Diffstat (limited to 'scripts')
-rw-r--r--scripts/azure-pipelines/end-to-end-tests-dir/disable-metrics.ps16
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/disable-metrics.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/disable-metrics.ps1
index efec472b4..5ad7616b4 100644
--- a/scripts/azure-pipelines/end-to-end-tests-dir/disable-metrics.ps1
+++ b/scripts/azure-pipelines/end-to-end-tests-dir/disable-metrics.ps1
@@ -41,6 +41,12 @@ try {
throw "Environment variable did not disable metrics."
}
+ # Also test that you get no message without --sendmetrics
+ $vcpkgOutput = Run-Vcpkg list
+ if ($vcpkgOutput -contains $metricsAreDisabledMessage) {
+ throw "Disabled metrics emit message even without --sendmetrics"
+ }
+
if (-Not (Test-Metrics-Enabled '--no-disable-metrics')) {
throw "Environment variable to disable metrics could not be overridden by switch."
}