Fix =skip handling. (#1849)

Billy made a bit of a mistake in #1822 resulting in the blizzard of failures in https://dev.azure.com/vcpkg/public/_build/results?buildId=122788

Author: BillyONeal

azure-pipelines/e2e-assets/ci-skipped-ports/always-built/portfile.cmake

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

azure-pipelines/e2e-assets/ci-skipped-ports/always-built/vcpkg.json

@@ -0,0 +1,4 @@
+{
+  "name": "always-built",
+  "version": "1.0.0"
+}

azure-pipelines/e2e-assets/ci-skipped-ports/always-cascade/portfile.cmake

@@ -0,0 +1 @@
+message(FATAL_ERROR "This port should always cascade and should not be attempted.")

azure-pipelines/e2e-assets/ci-skipped-ports/always-cascade/vcpkg.json

@@ -0,0 +1,7 @@
+{
+  "name": "always-cascade",
+  "version": "1.0.0",
+  "dependencies": [
+    "always-skip"
+  ]
+}

azure-pipelines/e2e-assets/ci-skipped-ports/always-skip/portfile.cmake

@@ -0,0 +1 @@
+message(FATAL_ERROR "This port should always be skipped by baseline.txt and should not be attempted.")

azure-pipelines/e2e-assets/ci-skipped-ports/always-skip/vcpkg.json

@@ -0,0 +1,7 @@
+{
+  "name": "always-skip",
+  "version": "1.0.0",
+  "dependencies": [
+    "always-built"
+  ]
+}

azure-pipelines/e2e-assets/ci-skipped-ports/baseline.txt

@@ -0,0 +1,5 @@
+always-skip:arm64-osx=skip
+always-skip:x64-linux=skip
+always-skip:x64-osx=skip
+always-skip:x64-windows=skip
+always-skip:x86-windows=skip

azure-pipelines/end-to-end-tests-dir/ci.ps1

@@ -93,6 +93,27 @@ SUMMARY FOR $Triplet
   UNSUPPORTED: 1
 "@
 
+# test that skipped ports aren't "put back" by downstream dependencies that aren't skipped
+Refresh-TestRoot
+$Output = Run-VcpkgAndCaptureOutput ci @commonArgs --x-builtin-ports-root="$PSScriptRoot/../e2e-assets/ci-skipped-ports" --binarysource=clear --ci-baseline="$PSScriptRoot/../e2e-assets/ci-skipped-ports/baseline.txt"
+Throw-IfFailed
+if (-not ($Output -match 'always-built:[^:]+:      \*:' -and $Output -match 'Building always-built:[^@]+@1\.0\.0\.\.\.')) {
+    throw 'did not attempt to build always-built'
+}
+if (-not ($Output -match 'always-skip:[^:]+: skip\n')) {
+    throw 'tried to build skipped'
+}
+# This should be statically determinable but at the moment we do not
+# if (-not ($Output -match 'always-cascade:[^:]+: cascade\n')) {
+#     throw 'tried to build cascaded'
+# }
+Throw-IfNonContains -Actual $Output -Expected @"
+SUMMARY FOR $Triplet
+  SUCCEEDED: 1
+  CASCADED_DUE_TO_MISSING_DEPENDENCIES: 1
+  EXCLUDED: 1
+"@
+
 # test that features included only by skipped ports are not included
 $xunitFile = Join-Path $TestingRoot 'xunit.xml'
 Refresh-TestRoot

src/vcpkg/commands.ci.cpp

@@ -197,7 +197,7 @@ namespace
             }
 
             ret.report_lines.insert_or_assign(exclusion.first, fmt::format("{:>40}: {}", exclusion.first, *state));
-            ret.known.emplace(exclusion.first, known_result);
+            ret.known.insert_or_assign(exclusion.first, known_result);
         }
 
         return ret;