Skip to content

Commit f0abfd6

Browse files
committed
Change output for regression of independent ports
1 parent f082459 commit f0abfd6

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

include/vcpkg/base/messages.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -722,10 +722,14 @@ namespace vcpkg
722722
(msg::spec, msg::path),
723723
"",
724724
"REGRESSION: {spec} cascaded, but it is required to pass. ({path}).");
725-
DECLARE_MESSAGE(CiBaselineRegression,
725+
DECLARE_MESSAGE(CiRegression,
726726
(msg::spec, msg::build_result, msg::path),
727727
"",
728728
"REGRESSION: {spec} failed with {build_result}. If expected, add {spec}=fail to {path}.");
729+
DECLARE_MESSAGE(CiBaselineRegression,
730+
(msg::spec, msg::build_result, msg::path),
731+
"",
732+
"BASELINE REGRESSION: Independent {spec} failed with {build_result}.");
729733
DECLARE_MESSAGE(CiBaselineRegressionHeader,
730734
(),
731735
"Printed before a series of CiBaselineRegression and/or CiBaselineUnexpectedPass messages.",

include/vcpkg/ci-baseline.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,6 @@ namespace vcpkg
6969
BuildResult result,
7070
const CiBaselineData& cidata,
7171
StringView cifile,
72-
bool allow_unexpected_passing);
72+
bool allow_unexpected_passing,
73+
bool is_independent);
7374
}

src/vcpkg/ci-baseline.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,8 @@ namespace vcpkg
204204
BuildResult result,
205205
const CiBaselineData& cidata,
206206
StringView cifile,
207-
bool allow_unexpected_passing)
207+
bool allow_unexpected_passing,
208+
bool is_independent)
208209
{
209210
switch (result)
210211
{
@@ -213,7 +214,7 @@ namespace vcpkg
213214
case BuildResult::FILE_CONFLICTS:
214215
if (!cidata.expected_failures.contains(spec))
215216
{
216-
return msg::format(msgCiBaselineRegression,
217+
return msg::format(is_independent ? msgCiBaselineRegression : msgCiRegression,
217218
msg::spec = spec,
218219
msg::build_result = to_string_locale_invariant(result),
219220
msg::path = cifile);

src/vcpkg/commands.ci.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ namespace vcpkg::Commands::CI
310310
for (auto&& r : results)
311311
{
312312
auto result = r.build_result.value_or_exit(VCPKG_LINE_INFO).code;
313-
auto msg = format_ci_result(r.get_spec(), result, cidata, ci_baseline_file_name, allow_unexpected_passing);
313+
auto msg = format_ci_result(r.get_spec(), result, cidata, ci_baseline_file_name, allow_unexpected_passing, !r.is_user_requested_install());
314314
if (!msg.empty())
315315
{
316316
has_error = true;
@@ -319,7 +319,7 @@ namespace vcpkg::Commands::CI
319319
}
320320
for (auto&& r : known)
321321
{
322-
auto msg = format_ci_result(r.first, r.second, cidata, ci_baseline_file_name, allow_unexpected_passing);
322+
auto msg = format_ci_result(r.first, r.second, cidata, ci_baseline_file_name, allow_unexpected_passing, true);
323323
if (!msg.empty())
324324
{
325325
has_error = true;

0 commit comments

Comments
 (0)