From 3f3d9a615a4f86ce892613885f00ca315cfe1e7e Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 14 Jan 2021 08:41:53 -0800 Subject: [PATCH] [vcpkg] Fix incorrect handling of messages for permenantly disabled metrics. (#15636) Fixes #15630 --- .../end-to-end-tests-dir/disable-metrics.ps1 | 6 ++++++ toolsrc/src/vcpkg.cpp | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) 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 efec472b4e..5ad7616b48 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." } diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp index f3a6ac6a09..783cb04292 100644 --- a/toolsrc/src/vcpkg.cpp +++ b/toolsrc/src/vcpkg.cpp @@ -256,7 +256,7 @@ int main(const int argc, const char* const* const argv) metrics->set_send_metrics(*p); } - if (args.send_metrics.value_or(true) && !metrics->metrics_enabled()) + if (args.send_metrics.value_or(false) && !metrics->metrics_enabled()) { System::print2(System::Color::warning, "Warning: passed --sendmetrics, but metrics are disabled.\n"); }