diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-07-09 21:55:15 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-07-10 20:50:32 +0200 |
| commit | 7a4763153548619b379222d5c22d10b238ba0ac3 (patch) | |
| tree | 9388ed2352aec643e938727bbbc9c9155d9092fb /test | |
| parent | 9e90111e53a0b0739d0789afd26f29e63f803917 (diff) | |
Convert some paths to string.
Diffstat (limited to 'test')
| -rw-r--r-- | test/audio_mapping_test.cc | 2 | ||||
| -rw-r--r-- | test/test.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/audio_mapping_test.cc b/test/audio_mapping_test.cc index 0b403a492..be850f805 100644 --- a/test/audio_mapping_test.cc +++ b/test/audio_mapping_test.cc @@ -73,7 +73,7 @@ guess_check (boost::filesystem::path filename, int output_channel) AudioMapping m (1, 8); m.make_default (0, filename); for (int i = 0; i < 8; ++i) { - BOOST_TEST_INFO (String::compose("%1 channel %2", filename, i)); + BOOST_TEST_INFO(String::compose("%1 channel %2", filename.string(), i)); BOOST_CHECK_CLOSE (m.get(0, i), i == output_channel ? 1 : 0, 0.01); } } diff --git a/test/test.cc b/test/test.cc index 553c4587a..6d8e6f5f7 100644 --- a/test/test.cc +++ b/test/test.cc @@ -1015,13 +1015,13 @@ make_and_verify_dcp(shared_ptr<Film> film, vector<dcp::VerificationNote::Code> i auto dcp_inspect_env = getenv("DCPOMATIC_DCP_INSPECT"); if (dcp_inspect && dcp_inspect_env) { boost::filesystem::path dcp_inspect(dcp_inspect_env); - auto cmd = String::compose("%1 %2 > %3 2>&1", dcp_inspect, film->dir(film->dcp_name()), film->file("dcp_inspect.log")); + auto cmd = String::compose("%1 %2 > %3 2>&1", dcp_inspect.string(), film->dir(film->dcp_name()).string(), film->file("dcp_inspect.log").string()); auto result = system(cmd.c_str()); BOOST_CHECK_EQUAL(WEXITSTATUS(result), 0); } if (clairmeta && getenv("DCPOMATIC_CLAIRMETA")) { - auto cmd = String::compose("python3 -m clairmeta.cli check -type dcp %1 > %2 2>&1", film->dir(film->dcp_name()), film->file("clairmeta.log")); + auto cmd = String::compose("python3 -m clairmeta.cli check -type dcp %1 > %2 2>&1", film->dir(film->dcp_name()).string(), film->file("clairmeta.log").string()); auto result = system(cmd.c_str()); BOOST_CHECK_EQUAL(WEXITSTATUS(result), 0); } |
