test-features: the baseline state must be overwriteable (#1730)

Author: autoantwort

azure-pipelines/e2e-assets/ci-feature-baseline/vcpkg-fail-or-cascade.txt

@@ -0,0 +1,2 @@
+vcpkg-fail-feature-cascades = fail
+vcpkg-fail-feature-cascades[cascade] = cascade

azure-pipelines/e2e-ports/vcpkg-fail-feature-cascades/portfile.cmake

@@ -0,0 +1,2 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+message(FATAL_ERROR "This port does not build")

azure-pipelines/e2e-ports/vcpkg-fail-feature-cascades/vcpkg.json

@@ -0,0 +1,18 @@
+{
+  "name": "vcpkg-fail-feature-cascades",
+  "version": "0",
+  "features": {
+    "cascade": {
+      "description": "is always cascaded",
+      "dependencies": [
+        {
+          "name": "vcpkg-self-cascade",
+          "default-features": false,
+          "features": [
+            "never"
+          ]
+        }
+      ]
+    }
+  }
+}

azure-pipelines/end-to-end-tests-dir/test-features.ps1

@@ -130,6 +130,12 @@ $ciFeatureBaseline = "$PSScriptRoot/../e2e-assets/ci-feature-baseline/vcpkg-self
 Run-VcpkgAndCaptureOutput x-test-features @commonArgs $vcpkgSelfCascadePortsArg --all --ci-feature-baseline $ciFeatureBaseline
 Throw-IfFailed
 
+# Ensure that the baseline without a feature can be overwritten by feature specific baselines.
+$ciFeatureBaseline = "$PSScriptRoot/../e2e-assets/ci-feature-baseline/vcpkg-fail-or-cascade.txt"
+$output = Run-VcpkgAndCaptureOutput x-test-features @commonArgs "--x-builtin-ports-root=$PSScriptRoot/../e2e-ports" vcpkg-fail-feature-cascades --ci-feature-baseline $ciFeatureBaseline
+Throw-IfFailed
+Throw-IfNonContains -Expected "All feature tests passed." -Actual $output
+
 $vcpkgRequiresFeatureArg = New-TestPortsRootArg vcpkg-requires-feature vcpkg-fail-if-depended-upon
 
 $output = Run-VcpkgAndCaptureOutput x-test-features @commonArgs $vcpkgRequiresFeatureArg vcpkg-requires-feature

src/vcpkg/ci-feature-baseline.cpp

@@ -339,21 +339,6 @@ namespace vcpkg
     {
         if (baseline)
         {
-            if (auto pstate = baseline->state.get())
-            {
-                switch (pstate->value)
-                {
-                    case CiFeatureBaselineState::Fail:
-                        return Located<CiFeatureBaselineOutcome>{pstate->loc, CiFeatureBaselineOutcome::PortMarkedFail};
-                    case CiFeatureBaselineState::Cascade:
-                        return Located<CiFeatureBaselineOutcome>{pstate->loc,
-                                                                 CiFeatureBaselineOutcome::PortMarkedCascade};
-                    case CiFeatureBaselineState::Skip:
-                    case CiFeatureBaselineState::Pass: break;
-                    default: Checks::unreachable(VCPKG_LINE_INFO);
-                }
-            }
-
             for (auto&& failing_configuration : baseline->fail_configurations)
             {
                 if (std::is_permutation(failing_configuration.value.begin(),
@@ -392,9 +377,17 @@ namespace vcpkg
 
             if (auto pstate = baseline->state.get())
             {
-                if (pstate->value == CiFeatureBaselineState::Pass)
+                switch (pstate->value)
                 {
-                    return Located<CiFeatureBaselineOutcome>{SourceLoc{}, CiFeatureBaselineOutcome::ExplicitPass};
+                    case CiFeatureBaselineState::Fail:
+                        return Located<CiFeatureBaselineOutcome>{pstate->loc, CiFeatureBaselineOutcome::PortMarkedFail};
+                    case CiFeatureBaselineState::Cascade:
+                        return Located<CiFeatureBaselineOutcome>{pstate->loc,
+                                                                 CiFeatureBaselineOutcome::PortMarkedCascade};
+                    case CiFeatureBaselineState::Skip: break;
+                    case CiFeatureBaselineState::Pass:
+                        return Located<CiFeatureBaselineOutcome>{SourceLoc{}, CiFeatureBaselineOutcome::ExplicitPass};
+                    default: Checks::unreachable(VCPKG_LINE_INFO);
                 }
             }
         }