diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-02-20 22:59:58 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-02-20 23:00:36 +0100 |
| commit | 201eed51d026a6e6b837d40f4e3b639847fe7bee (patch) | |
| tree | 829bf205eeb43a4af038c582bdef44e9926ea02a | |
| parent | 5ae223a91e66e53afffa1c48ebc01812166889de (diff) | |
Accept multiple DCP verification results when making a report.
| -rw-r--r-- | src/verify_report.cc | 23 | ||||
| -rw-r--r-- | src/verify_report.h | 2 | ||||
| -rw-r--r-- | test/verify_report_test.cc | 18 | ||||
| -rw-r--r-- | tools/dcpverify.cc | 2 |
4 files changed, 28 insertions, 17 deletions
diff --git a/src/verify_report.cc b/src/verify_report.cc index bcbda1ff..15b38846 100644 --- a/src/verify_report.cc +++ b/src/verify_report.cc @@ -64,14 +64,9 @@ void write_line(File& file, string format, Args... args) } -void -dcp::verify_report(dcp::VerificationResult const& result, Formatter& formatter) +static void +verify_report(dcp::VerificationResult const& result, Formatter& formatter) { - auto document = formatter.document(); - auto body = formatter.body(); - - formatter.heading("DCP verification report"); - if (result.dcps.size() > 1) { formatter.subheading("DCPs"); } else { @@ -149,3 +144,17 @@ dcp::verify_report(dcp::VerificationResult const& result, Formatter& formatter) } } + +void +dcp::verify_report(vector<dcp::VerificationResult> const& results, Formatter& formatter) +{ + auto document = formatter.document(); + auto body = formatter.body(); + + formatter.heading("DCP verification report"); + + for (auto result: results) { + ::verify_report(result, formatter); + } +} + diff --git a/src/verify_report.h b/src/verify_report.h index a8ea4152..98431102 100644 --- a/src/verify_report.h +++ b/src/verify_report.h @@ -233,7 +233,7 @@ private: }; -extern void verify_report(dcp::VerificationResult const& result, Formatter& formatter); +extern void verify_report(std::vector<dcp::VerificationResult> const& results, Formatter& formatter); } diff --git a/test/verify_report_test.cc b/test/verify_report_test.cc index 6b288891..ddc7eacf 100644 --- a/test/verify_report_test.cc +++ b/test/verify_report_test.cc @@ -29,14 +29,16 @@ BOOST_AUTO_TEST_CASE(verify_report_basically_ok) { dcp::HTMLFormatter formatter("build/test/verify_report_basically_ok.html"); dcp::verify_report( - dcp::verify( - { private_test / "TONEPLATES-SMPTE-PLAINTEXT_TST_F_XX-XX_ITL-TD_51-XX_2K_WOE_20111001_WOE_OV" }, - {}, - [](std::string, boost::optional<boost::filesystem::path>) {}, - [](float) {}, - {}, - xsd_test - ), + { + dcp::verify( + { private_test / "TONEPLATES-SMPTE-PLAINTEXT_TST_F_XX-XX_ITL-TD_51-XX_2K_WOE_20111001_WOE_OV" }, + {}, + [](std::string, boost::optional<boost::filesystem::path>) {}, + [](float) {}, + {}, + xsd_test + ) + }, formatter ); } diff --git a/tools/dcpverify.cc b/tools/dcpverify.cc index 88f0d705..0dc09d50 100644 --- a/tools/dcpverify.cc +++ b/tools/dcpverify.cc @@ -225,7 +225,7 @@ main (int argc, char* argv[]) if (report_filename) { dcp::HTMLFormatter formatter(*report_filename); - dcp::verify_report(result, formatter); + dcp::verify_report({ result }, formatter); } exit (failed ? EXIT_FAILURE : EXIT_SUCCESS); |