Identifiers

Author: dg0yt

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

@@ -483,10 +483,6 @@ DECLARE_MESSAGE(CiBaselineRegressionHeader,
                 (),
                 "Printed before a series of CiBaselineRegression and/or CiBaselineUnexpectedPass messages.",
                 "REGRESSIONS:")
-DECLARE_MESSAGE(CiBaselineUnexpectedCascadePass,
-                (msg::spec, msg::triplet),
-                "",
-                "REGRESSION: {spec} is marked as pass but one dependency is not supported for {triplet}.")
 DECLARE_MESSAGE(CiBaselineUnexpectedFail,
                 (msg::spec, msg::triplet),
                 "",
@@ -495,14 +491,18 @@ DECLARE_MESSAGE(CiBaselineUnexpectedFailCascade,
                 (msg::spec, msg::triplet),
                 "",
                 "REGRESSION: {spec} is marked as fail but one dependency is not supported for {triplet}.")
-DECLARE_MESSAGE(CiBaselineUnexpectedFailPass,
-                (msg::spec, msg::triplet),
-                "",
-                "REGRESSION: {spec} is marked as pass but not supported for {triplet}.")
 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),
+                "",
+                "REGRESSION: {spec} is marked as pass but not supported for {triplet}.")
 DECLARE_MESSAGE(CISettingsOptCIBase,
                 (),
                 "",

locales/messages.json

@@ -305,16 +305,16 @@
   "_CiBaselineRegressionHeader.comment": "Printed before a series of CiBaselineRegression and/or CiBaselineUnexpectedPass messages.",
   "CiBaselineRegressionNoPath": "REGRESSION: {spec} failed with {build_result}.",
   "_CiBaselineRegressionNoPath.comment": "An example of {spec} is zlib:x64-windows. An example of {build_result} is One of the BuildResultXxx messages (such as BuildResultSucceeded/SUCCEEDED).",
-  "CiBaselineUnexpectedCascadePass": "REGRESSION: {spec} is marked as pass but one dependency is not supported for {triplet}.",
-  "_CiBaselineUnexpectedCascadePass.comment": "An example of {spec} is zlib:x64-windows. An example of {triplet} is x64-windows.",
   "CiBaselineUnexpectedFail": "REGRESSION: {spec} is marked as fail but not supported for {triplet}.",
   "_CiBaselineUnexpectedFail.comment": "An example of {spec} is zlib:x64-windows. An example of {triplet} is x64-windows.",
   "CiBaselineUnexpectedFailCascade": "REGRESSION: {spec} is marked as fail but one dependency is not supported for {triplet}.",
   "_CiBaselineUnexpectedFailCascade.comment": "An example of {spec} is zlib:x64-windows. An example of {triplet} is x64-windows.",
-  "CiBaselineUnexpectedFailPass": "REGRESSION: {spec} is marked as pass but not supported for {triplet}.",
-  "_CiBaselineUnexpectedFailPass.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}",
   "_ClearingContents.comment": "An example of {path} is /foo/bar.",
   "CmakeTargetsExcluded": "{count} additional targets are not displayed.",

src/vcpkg/commands.ci.cpp

@@ -420,7 +420,7 @@ namespace vcpkg
                     else if (cidata.required_success.contains(spec.package_spec))
                     {
                         not_supported_regressions
-                            .append(supp ? msgCiBaselineUnexpectedCascadePass : msgCiBaselineUnexpectedFailPass,
+                            .append(supp ? msgCiBaselineUnexpectedPassCascade : msgCiBaselineUnexpectedPassUnsupported,
                                     msg::spec = spec.package_spec,
                                     msg::triplet = spec.package_spec.triplet())
                             .append_raw('\n');