Test fixes. Note that CiBaselineUnexpectedPassCascade is deleted and we consider "real" cascades equivalent to statically known cascades in reporting.

Author: BillyONeal

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

@@ -35,7 +35,7 @@ Throw-IfNotFailed
 if (-not ($ErrorOutput.Contains("REGRESSION: not-sup-host-b:${Triplet} is marked as pass but not supported for ${Triplet}."))) {
     throw "feature-not-sup's baseline pass entry should result in a regression because the port is not supported"
 }
-if (-not ($ErrorOutput.Contains("REGRESSION: dep-on-feature-not-sup:${Triplet} is marked as pass but one dependency is not supported for ${Triplet}."))) {
+if (-not ($ErrorOutput.Contains("REGRESSION: dep-on-feature-not-sup:${Triplet} cascaded, but it is required to pass. ("))) {
     throw "feature-not-sup's baseline pass entry should result in a regression because the port is cascade for this triplet"
 }
 

include/vcpkg/base/message-data.inc.h

@@ -515,10 +515,6 @@ DECLARE_MESSAGE(CiBaselineUnexpectedPass,
                 (msg::spec, msg::path),
                 "",
                 "PASSING, REMOVE FROM FAIL LIST: {spec} ({path}).")
-DECLARE_MESSAGE(CiBaselineUnexpectedPassCascade,
-                (msg::spec, msg::triplet),
-                "",
-                "REGRESSION: {spec} is marked as pass but one dependency is not supported for {triplet}.")
 DECLARE_MESSAGE(CiBaselineUnexpectedPassUnsupported,
                 (msg::spec, msg::triplet),
                 "",

locales/messages.json

@@ -317,8 +317,6 @@
   "_CiBaselineUnexpectedFailCascade.comment": "An example of {spec} is zlib:x64-windows. An example of {triplet} is x64-windows.",
   "CiBaselineUnexpectedPass": "PASSING, REMOVE FROM FAIL LIST: {spec} ({path}).",
   "_CiBaselineUnexpectedPass.comment": "An example of {spec} is zlib:x64-windows. An example of {path} is /foo/bar.",
-  "CiBaselineUnexpectedPassCascade": "REGRESSION: {spec} is marked as pass but one dependency is not supported for {triplet}.",
-  "_CiBaselineUnexpectedPassCascade.comment": "An example of {spec} is zlib:x64-windows. An example of {triplet} is x64-windows.",
   "CiBaselineUnexpectedPassUnsupported": "REGRESSION: {spec} is marked as pass but not supported for {triplet}.",
   "_CiBaselineUnexpectedPassUnsupported.comment": "An example of {spec} is zlib:x64-windows. An example of {triplet} is x64-windows.",
   "ClearingContents": "Clearing contents of {path}",

src/vcpkg-test/ci-baseline.cpp

@@ -360,7 +360,8 @@ TEST_CASE ("format_ci_result 1", "[ci-baseline]")
             return format_ci_result(s, BuildResult::CascadedDueToMissingDependencies, cidata, &cifile, false);
         };
         CHECK(test({"pass", Test::X64_UWP}) == fmt::format(cascademsg, "pass:x64-uwp"));
-        CHECK(test({"fail", Test::X64_UWP}) == "");
+        CHECK(test({"fail", Test::X64_UWP}) ==
+              "REGRESSION: fail:x64-uwp is marked as fail but one dependency is not supported for x64-uwp.");
         CHECK(test({"neither", Test::X64_UWP}) == "");
     }
 }

src/vcpkg/ci-baseline.cpp

@@ -225,18 +225,19 @@ namespace vcpkg
                     return msg::format(
                         msgCiBaselineUnexpectedFailCascade, msg::spec = spec, msg::triplet = spec.triplet());
                 }
-                else if (cidata.required_success.contains(spec))
+
+                if (cidata.required_success.contains(spec))
                 {
-                    return msg::format(
-                        msgCiBaselineUnexpectedPassCascade, msg::spec = spec, msg::triplet = spec.triplet());
+                    return msg::format(msgCiBaselineDisallowedCascade, msg::spec = spec, msg::path = *cifile);
                 }
                 break;
             case BuildResult::Unsupported:
                 if (cidata.expected_failures.contains(spec))
                 {
                     return msg::format(msgCiBaselineUnexpectedFail, msg::spec = spec, msg::triplet = spec.triplet());
                 }
-                else if (cidata.required_success.contains(spec))
+
+                if (cidata.required_success.contains(spec))
                 {
                     return msg::format(
                         msgCiBaselineUnexpectedPassUnsupported, msg::spec = spec, msg::triplet = spec.triplet());