Fix stealth merge conflict (#904)

* Fix stealth merge conflict Between #856 and #899 * Oops, one more e2e test format SNAFU
microsoft · Feb 15, 2023 · e9487f1 · e9487f1
1 parent 2f3a6b4
commit e9487f1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/azure-pipelines/end-to-end-tests-dir/ci.ps1 b/azure-pipelines/end-to-end-tests-dir/ci.ps1
@@ -1,17 +1,5 @@
 . $PSScriptRoot/../end-to-end-tests-prelude.ps1
 
-# Not a number
-Run-Vcpkg ci --dry-run --triplet=$Triplet --x-skipped-cascade-count=fish
-Throw-IfNotFailed
-
-# Negative
-Run-Vcpkg ci --dry-run --triplet=$Triplet --x-skipped-cascade-count=-1
-Throw-IfNotFailed
-
-# Clearly not the correct answer
-Run-Vcpkg ci --dry-run --triplet=$Triplet --x-skipped-cascade-count=1000
-Throw-IfNotFailed
-
 # test skipped ports
 $Output = Run-VcpkgAndCaptureOutput ci --dry-run --triplet=$Triplet --x-builtin-ports-root="$PSScriptRoot/../e2e_ports/ci"  --binarysource=clear
 Throw-IfFailed
@@ -26,4 +14,4 @@ if (-not ($Output.Contains("feature-not-sup:${Triplet}:        *"))) {
 }
 if ($Output.Split("*").Length -ne 3) {
     throw 'base-port should not be installed for the host'
-}
+}
diff --git a/src/vcpkg/commands.ci.cpp b/src/vcpkg/commands.ci.cpp
@@ -180,7 +180,7 @@ namespace vcpkg::Commands::CI
 
         const auto applicable_specs = Util::filter(specs, [&](auto& spec) -> bool {
             return create_feature_install_plan(provider, var_provider, {&spec, 1}, {}, serialize_options)
-                .warnings.empty();
+                .unsupported_features.empty();
         });
 
         auto action_plan = create_feature_install_plan(provider, var_provider, applicable_specs, {}, serialize_options);
@@ -463,13 +463,13 @@ namespace vcpkg::Commands::CI
                                                supp ? BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES
                                                     : BuildResult::EXCLUDED);
                     if (supp) ++split_specs->cascade_count;
-                    msg += Strings::format("%40s: %8s\n", spec.package_spec, supp ? "cascade" : "skip");
+                    msg += fmt::format("{:>40}: {:>8}\n", spec.package_spec, supp ? "cascade" : "skip");
                 }
             }
             for (size_t i = 0; i < action_plan.install_actions.size(); ++i)
             {
                 auto&& action = action_plan.install_actions[i];
-                msg += fmt::format("{:40}: {:8}: {}\n",
+                msg += fmt::format("{:>40}: {:>8}: {}\n",
                                    action.spec,
                                    split_specs->action_state_string[i],
                                    action.abi_info.value_or_exit(VCPKG_LINE_INFO).package_abi);