Skip to content

Commit e35ae04

Browse files
authored
Fix validate --benchmark printing errors twice (#820)
Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>
1 parent 135bc54 commit e35ae04

2 files changed

Lines changed: 0 additions & 7 deletions

File tree

src/command_validate.cc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ auto process_entry(
143143
std::uint64_t benchmark_loop, bool trace, bool fast_mode, bool json_output,
144144
bool continue_on_error, const std::filesystem::path &schema_resolution_base,
145145
const sourcemeta::core::Options &options, bool &result) -> bool {
146-
std::ostringstream error;
147146
sourcemeta::blaze::SimpleOutput output{entry.second};
148147
sourcemeta::blaze::TraceOutput trace_output{
149148
sourcemeta::blaze::schema_walker, custom_resolver,
@@ -157,7 +156,6 @@ auto process_entry(
157156
: static_cast<std::int64_t>(-1),
158157
benchmark_loop);
159158
if (!subresult) {
160-
error << "error: Schema validation failure\n";
161159
result = false;
162160
}
163161
} else if (trace) {
@@ -221,7 +219,6 @@ auto process_entry(
221219
} else {
222220
std::cerr << "\n";
223221
}
224-
std::cerr << error.str();
225222
sourcemeta::jsonschema::print(output, entry.positions, std::cerr);
226223
result = false;
227224
if (entry.multidocument && !continue_on_error) {
@@ -425,7 +422,6 @@ auto sourcemeta::jsonschema::validate(const sourcemeta::core::Options &options)
425422
}
426423
return sourcemeta::core::read_yaml_or_json(instance_path);
427424
}()};
428-
std::ostringstream error;
429425
sourcemeta::blaze::SimpleOutput output{instance};
430426
sourcemeta::blaze::TraceOutput trace_output{
431427
sourcemeta::blaze::schema_walker, custom_resolver,
@@ -437,7 +433,6 @@ auto sourcemeta::jsonschema::validate(const sourcemeta::core::Options &options)
437433
instance_path.generic_string(), (int64_t)-1,
438434
benchmark_loop);
439435
if (!subresult) {
440-
error << "error: Schema validation failure\n";
441436
result = false;
442437
}
443438
} else if (trace) {
@@ -480,7 +475,6 @@ auto sourcemeta::jsonschema::validate(const sourcemeta::core::Options &options)
480475
<< sourcemeta::core::weakly_canonical(instance_path)
481476
.generic_string()
482477
<< "\n";
483-
std::cerr << error.str();
484478
print(output, tracker, std::cerr);
485479
result = false;
486480
}

test/validate/fail_benchmark.clitest

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ WRITE expected_0.txt UNTIL EOF
2626
1> instance.json: FAIL [TIMING]
2727
2> fail: [CWD]/instance.json
2828
2> error: Schema validation failure
29-
2> error: Schema validation failure
3029
EOF
3130

3231
COMPARE result_0.txt AGAINST expected_0.txt

0 commit comments

Comments
 (0)