Fix detection of regressions of independent ports

Author: dg0yt

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

@@ -113,3 +113,12 @@ if (-not ($Output.Contains("feature-fails:${Triplet}: BUILD_FAILED:"))) {
 if (-not ($Output.Contains("regression:${Triplet}: CASCADED_DUE_TO_MISSING_DEPENDENCIES:"))) {
     throw 'regression build must cascade'
 }
+# Non-dry run with port regression@2
+$Output = Run-VcpkgAndCaptureStdErr ci @commonArgs --x-builtin-ports-root="$PSScriptRoot/../e2e-ports/ci" --binarysource="clear;files,$ArchiveRoot" --parent-hashes="$TestingRoot/parent-hashes.json"  --overlay-ports="$PSScriptRoot/../e2e-ports/ci-independent-regression/v2"
+Throw-IfNotFailed
+if (-not ($Output.Contains("REGRESSION: Independent feature-fails:${Triplet} failed with BUILD_FAILED."))) {
+    throw 'feature-fails[fail] build failure must be reported as independent regression'
+}
+if ($Output.Contains("REGRESSION: Independent regression:${Triplet} failed with BUILD_FAILED.")) {
+    throw 'regression (port) build failure must not be reported as independent regression'
+}

src/vcpkg/commands.ci.cpp

@@ -173,6 +173,8 @@ namespace
                             const std::map<PackageSpec, BuildResult>& known,
                             View<std::string> parent_hashes)
     {
+        // With parent hashes, ports are merely "auto selected" unless the abi hash changed.
+        auto const default_request_type = parent_hashes.empty() ? RequestType::USER_REQUESTED : RequestType::AUTO_SELECTED;
         std::set<PackageSpec> to_keep;
         for (auto it = action_plan.install_actions.rbegin(); it != action_plan.install_actions.rend(); ++it)
         {
@@ -187,6 +189,10 @@ namespace
                     to_keep.insert(it->spec);
                 }
             }
+            else
+            {
+                it->request_type = default_request_type;
+            }
 
             if (Util::Sets::contains(to_keep, it->spec))
             {