From 5ff6b15ef3c58a046fb9eec0273c5e7322988a14 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 9 Mar 2020 16:45:26 +0100 Subject: [PATCH] Move private_data into TestPaths --- test/audio_analysis_test.cc | 8 ++++---- test/content_test.cc | 2 +- test/dcp_playback_test.cc | 2 +- test/dcp_subtitle_test.cc | 2 +- test/ffmpeg_audio_test.cc | 4 ++-- test/ffmpeg_decoder_seek_test.cc | 2 +- test/ffmpeg_decoder_sequential_test.cc | 2 +- test/ffmpeg_encoder_test.cc | 14 +++++++------- test/ffmpeg_examiner_test.cc | 2 +- test/image_test.cc | 4 ++-- test/interrupt_encoder_test.cc | 2 +- test/j2k_bandwidth_test.cc | 2 +- test/player_test.cc | 8 ++++---- test/remake_with_subtitle_test.cc | 4 ++-- test/silence_padding_test.cc | 2 +- test/srt_subtitle_test.cc | 4 ++-- test/ssa_subtitle_test.cc | 4 ++-- test/subtitle_charset_test.cc | 2 +- test/test.cc | 4 ++-- test/test.h | 2 +- test/threed_test.cc | 8 ++++---- 21 files changed, 42 insertions(+), 42 deletions(-) diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc index 5d65ab693..562039d93 100644 --- a/test/audio_analysis_test.cc +++ b/test/audio_analysis_test.cc @@ -111,7 +111,7 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test) film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR")); film->set_container (Ratio::from_id ("185")); film->set_name ("audio_analysis_test"); - boost::filesystem::path p = private_data / "betty_L.wav"; + boost::filesystem::path p = TestPaths::private_data / "betty_L.wav"; shared_ptr c (new FFmpegContent(p)); film->examine_and_add_content (c); @@ -128,7 +128,7 @@ BOOST_AUTO_TEST_CASE (audio_analysis_negative_delay_test) { shared_ptr film = new_test_film ("audio_analysis_negative_delay_test"); film->set_name ("audio_analysis_negative_delay_test"); - shared_ptr c (new FFmpegContent(private_data / "boon_telly.mkv")); + shared_ptr c (new FFmpegContent(TestPaths::private_data / "boon_telly.mkv")); film->examine_and_add_content (c); BOOST_REQUIRE (!wait_for_jobs()); @@ -145,7 +145,7 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test2) { shared_ptr film = new_test_film ("audio_analysis_test2"); film->set_name ("audio_analysis_test2"); - shared_ptr c (new FFmpegContent(private_data / "3d_thx_broadway_2010_lossless.m2ts")); + shared_ptr c (new FFmpegContent(TestPaths::private_data / "3d_thx_broadway_2010_lossless.m2ts")); film->examine_and_add_content (c); BOOST_REQUIRE (!wait_for_jobs()); @@ -192,7 +192,7 @@ BOOST_AUTO_TEST_CASE (analyse_audio_test4) film->set_container (Ratio::from_id ("185")); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); film->set_name ("frobozz"); - shared_ptr content = content_factory(private_data / "20 The Wedding Convoy Song.m4a").front(); + shared_ptr content = content_factory(TestPaths::private_data / "20 The Wedding Convoy Song.m4a").front(); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs()); diff --git a/test/content_test.cc b/test/content_test.cc index 2f8963f5b..fb66b2e08 100644 --- a/test/content_test.cc +++ b/test/content_test.cc @@ -42,7 +42,7 @@ BOOST_AUTO_TEST_CASE (content_test1) film->set_name ("content_test1"); film->set_container (Ratio::from_id ("185")); - shared_ptr content = content_factory(private_data / "demo_sound_bug.mkv").front (); + shared_ptr content = content_factory(TestPaths::private_data / "demo_sound_bug.mkv").front (); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs ()); film->make_dcp (); diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc index 1dda667a0..787857375 100644 --- a/test/dcp_playback_test.cc +++ b/test/dcp_playback_test.cc @@ -34,7 +34,7 @@ using namespace dcpomatic; BOOST_AUTO_TEST_CASE (dcp_playback_test) { shared_ptr film = new_test_film ("dcp_playback_test"); - shared_ptr content (new DCPContent(private_data / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV")); + shared_ptr content (new DCPContent(TestPaths::private_data / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV")); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs()); diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc index 64800c100..80dacbb47 100644 --- a/test/dcp_subtitle_test.cc +++ b/test/dcp_subtitle_test.cc @@ -87,7 +87,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test) film->set_container (Ratio::from_id ("185")); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); film->set_name ("frobozz"); - shared_ptr content (new DCPContent(private_data / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV")); + shared_ptr content (new DCPContent(TestPaths::private_data / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV")); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs ()); diff --git a/test/ffmpeg_audio_test.cc b/test/ffmpeg_audio_test.cc index 067075d25..8e0fd9280 100644 --- a/test/ffmpeg_audio_test.cc +++ b/test/ffmpeg_audio_test.cc @@ -130,7 +130,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test) BOOST_AUTO_TEST_CASE (ffmpeg_audio_test2) { shared_ptr film = new_test_film2 ("ffmpeg_audio_test2"); - shared_ptr content = content_factory(private_data / "wayne.mkv").front(); + shared_ptr content = content_factory(TestPaths::private_data / "wayne.mkv").front(); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs ()); @@ -142,7 +142,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test2) BOOST_AUTO_TEST_CASE (ffmpeg_audio_test3) { shared_ptr film = new_test_film2 ("ffmpeg_audio_test2"); - shared_ptr content = content_factory(private_data / "wayne.mkv").front(); + shared_ptr content = content_factory(TestPaths::private_data / "wayne.mkv").front(); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs ()); diff --git a/test/ffmpeg_decoder_seek_test.cc b/test/ffmpeg_decoder_seek_test.cc index 3e825e443..8adcbf8b8 100644 --- a/test/ffmpeg_decoder_seek_test.cc +++ b/test/ffmpeg_decoder_seek_test.cc @@ -67,7 +67,7 @@ check (shared_ptr decoder, int frame) static void test (boost::filesystem::path file, vector frames) { - boost::filesystem::path path = private_data / file; + boost::filesystem::path path = TestPaths::private_data / file; BOOST_REQUIRE (boost::filesystem::exists (path)); shared_ptr film = new_test_film ("ffmpeg_decoder_seek_test_" + file.string()); diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc index e523a7b76..cf841bcab 100644 --- a/test/ffmpeg_decoder_sequential_test.cc +++ b/test/ffmpeg_decoder_sequential_test.cc @@ -57,7 +57,7 @@ check (shared_ptr, DCPTime time) void ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int video_length) { - boost::filesystem::path path = private_data / file; + boost::filesystem::path path = TestPaths::private_data / file; BOOST_REQUIRE (boost::filesystem::exists (path)); shared_ptr film = new_test_film ("ffmpeg_decoder_sequential_test_" + file.string()); diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc index 1acfa96df..10186abcc 100644 --- a/test/ffmpeg_encoder_test.cc +++ b/test/ffmpeg_encoder_test.cc @@ -85,19 +85,19 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test1) /** Dolby Aurora trailer VOB -> Prores */ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test2) { - ffmpeg_content_test (2, private_data / "dolby_aurora.vob", EXPORT_FORMAT_PRORES); + ffmpeg_content_test (2, TestPaths::private_data / "dolby_aurora.vob", EXPORT_FORMAT_PRORES); } /** Sintel trailer -> Prores */ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test3) { - ffmpeg_content_test (3, private_data / "Sintel_Trailer1.480p.DivX_Plus_HD.mkv", EXPORT_FORMAT_PRORES); + ffmpeg_content_test (3, TestPaths::private_data / "Sintel_Trailer1.480p.DivX_Plus_HD.mkv", EXPORT_FORMAT_PRORES); } /** Big Buck Bunny trailer -> Prores */ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test4) { - ffmpeg_content_test (4, private_data / "big_buck_bunny_trailer_480p.mov", EXPORT_FORMAT_PRORES); + ffmpeg_content_test (4, TestPaths::private_data / "big_buck_bunny_trailer_480p.mov", EXPORT_FORMAT_PRORES); } /** Still image -> Prores */ @@ -105,7 +105,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test5) { shared_ptr film = new_test_film ("ffmpeg_encoder_prores_test5"); film->set_name ("ffmpeg_encoder_prores_test5"); - shared_ptr c (new ImageContent(private_data / "bbc405.png")); + shared_ptr c (new ImageContent(TestPaths::private_data / "bbc405.png")); film->set_container (Ratio::from_id ("185")); film->set_audio_channels (6); @@ -319,7 +319,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test5) BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test6) { shared_ptr film = new_test_film2 ("ffmpeg_encoder_h264_test6_ov"); - film->examine_and_add_content (shared_ptr(new ImageContent(private_data / "bbc405.png"))); + film->examine_and_add_content (shared_ptr(new ImageContent(TestPaths::private_data / "bbc405.png"))); BOOST_REQUIRE (!wait_for_jobs()); film->make_dcp (); BOOST_REQUIRE (!wait_for_jobs()); @@ -349,9 +349,9 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test6) BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test7) { shared_ptr film = new_test_film2 ("ffmpeg_encoder_h264_test7_data"); - shared_ptr L (shared_ptr(new ImageContent(private_data / "bbc405.png"))); + shared_ptr L (shared_ptr(new ImageContent(TestPaths::private_data / "bbc405.png"))); film->examine_and_add_content (L); - shared_ptr R (shared_ptr(new ImageContent(private_data / "bbc405.png"))); + shared_ptr R (shared_ptr(new ImageContent(TestPaths::private_data / "bbc405.png"))); film->examine_and_add_content (R); BOOST_REQUIRE (!wait_for_jobs()); L->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT); diff --git a/test/ffmpeg_examiner_test.cc b/test/ffmpeg_examiner_test.cc index f8453ddb5..e83b20c54 100644 --- a/test/ffmpeg_examiner_test.cc +++ b/test/ffmpeg_examiner_test.cc @@ -52,7 +52,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_examiner_test) */ BOOST_AUTO_TEST_CASE (ffmpeg_examiner_probesize_test) { - shared_ptr content (new FFmpegContent(private_data / "RockyTop10 Playlist Flat.m4v")); + shared_ptr content (new FFmpegContent(TestPaths::private_data / "RockyTop10 Playlist Flat.m4v")); shared_ptr examiner (new FFmpegExaminer(content)); BOOST_CHECK_EQUAL (examiner->audio_streams().size(), 2U); diff --git a/test/image_test.cc b/test/image_test.cc index 4eb2f0486..e021322e0 100644 --- a/test/image_test.cc +++ b/test/image_test.cc @@ -137,7 +137,7 @@ BOOST_AUTO_TEST_CASE (compact_image_test) void alpha_blend_test_one (AVPixelFormat format, string suffix) { - shared_ptr proxy (new FFmpegImageProxy (private_data / "prophet_frame.tiff")); + shared_ptr proxy (new FFmpegImageProxy (TestPaths::private_data / "prophet_frame.tiff")); shared_ptr raw = proxy->image().first; shared_ptr background = raw->convert_pixel_format (dcp::YUV_TO_RGB_REC709, format, true, false); @@ -173,7 +173,7 @@ alpha_blend_test_one (AVPixelFormat format, string suffix) shared_ptr save = background->convert_pixel_format (dcp::YUV_TO_RGB_REC709, AV_PIX_FMT_RGB24, false, false); write_image (save, "build/test/image_test_" + suffix + ".png", "RGB"); - check_image ("build/test/image_test_" + suffix + ".png", private_data / ("image_test_" + suffix + ".png")); + check_image ("build/test/image_test_" + suffix + ".png", TestPaths::private_data / ("image_test_" + suffix + ".png")); } /** Test Image::alpha_blend */ diff --git a/test/interrupt_encoder_test.cc b/test/interrupt_encoder_test.cc index ed988a65b..ddad2ee77 100644 --- a/test/interrupt_encoder_test.cc +++ b/test/interrupt_encoder_test.cc @@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE (interrupt_encoder_test) film->set_container (Ratio::from_id ("185")); film->set_name ("interrupt_encoder_test"); - shared_ptr content (new FFmpegContent(private_data / "prophet_long_clip.mkv")); + shared_ptr content (new FFmpegContent(TestPaths::private_data / "prophet_long_clip.mkv")); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs()); diff --git a/test/j2k_bandwidth_test.cc b/test/j2k_bandwidth_test.cc index 40309df87..e66cf1829 100644 --- a/test/j2k_bandwidth_test.cc +++ b/test/j2k_bandwidth_test.cc @@ -45,7 +45,7 @@ check (int target_bits_per_second) film->set_name (name); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR")); film->set_j2k_bandwidth (target_bits_per_second); - shared_ptr content (new ImageContent(private_data / "prophet_frame.tiff")); + shared_ptr content (new ImageContent(TestPaths::private_data / "prophet_frame.tiff")); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs()); content->video->set_length (24 * duration); diff --git a/test/player_test.cc b/test/player_test.cc index b2b32ba2b..a242d620b 100644 --- a/test/player_test.cc +++ b/test/player_test.cc @@ -205,7 +205,7 @@ BOOST_AUTO_TEST_CASE (player_interleave_test) BOOST_AUTO_TEST_CASE (player_seek_test) { shared_ptr film (new Film (optional())); - shared_ptr dcp (new DCPContent(private_data / "awkward_subs")); + shared_ptr dcp (new DCPContent(TestPaths::private_data / "awkward_subs")); film->examine_and_add_content (dcp, true); BOOST_REQUIRE (!wait_for_jobs ()); dcp->only_text()->set_use (true); @@ -236,7 +236,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test) BOOST_AUTO_TEST_CASE (player_seek_test2) { shared_ptr film (new Film (optional())); - shared_ptr dcp (new DCPContent(private_data / "awkward_subs2")); + shared_ptr dcp (new DCPContent(TestPaths::private_data / "awkward_subs2")); film->examine_and_add_content (dcp, true); BOOST_REQUIRE (!wait_for_jobs ()); dcp->only_text()->set_use (true); @@ -302,7 +302,7 @@ store (list* out, PlayerText text, TextType type, optional tr BOOST_AUTO_TEST_CASE (player_ignore_video_and_audio_test) { shared_ptr film = new_test_film2 ("player_ignore_video_and_audio_test"); - shared_ptr ff = content_factory(private_data / "boon_telly.mkv").front(); + shared_ptr ff = content_factory(TestPaths::private_data / "boon_telly.mkv").front(); film->examine_and_add_content (ff); shared_ptr text = content_factory("test/data/subrip.srt").front(); film->examine_and_add_content (text); @@ -325,7 +325,7 @@ BOOST_AUTO_TEST_CASE (player_ignore_video_and_audio_test) BOOST_AUTO_TEST_CASE (player_trim_crash) { shared_ptr film = new_test_film2 ("player_trim_crash"); - shared_ptr boon = content_factory(private_data / "boon_telly.mkv").front(); + shared_ptr boon = content_factory(TestPaths::private_data / "boon_telly.mkv").front(); film->examine_and_add_content (boon); BOOST_REQUIRE (!wait_for_jobs()); diff --git a/test/remake_with_subtitle_test.cc b/test/remake_with_subtitle_test.cc index 399796698..2321653d9 100644 --- a/test/remake_with_subtitle_test.cc +++ b/test/remake_with_subtitle_test.cc @@ -34,7 +34,7 @@ using boost::dynamic_pointer_cast; BOOST_AUTO_TEST_CASE (remake_with_subtitle_test) { shared_ptr film = new_test_film2 ("remake_with_subtitle_test"); - shared_ptr content = dynamic_pointer_cast(content_factory(private_data / "prophet_short_clip.mkv").front()); + shared_ptr content = dynamic_pointer_cast(content_factory(TestPaths::private_data / "prophet_short_clip.mkv").front()); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs ()); content->only_text()->set_burn (true); @@ -48,5 +48,5 @@ BOOST_AUTO_TEST_CASE (remake_with_subtitle_test) film->make_dcp (); BOOST_REQUIRE (!wait_for_jobs ()); - check_one_frame (film->dir(film->dcp_name()), 325, private_data / "prophet_frame_325_no_subs.j2c"); + check_one_frame (film->dir(film->dcp_name()), 325, TestPaths::private_data / "prophet_frame_325_no_subs.j2c"); } diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc index b15f4691b..dcabf2955 100644 --- a/test/silence_padding_test.cc +++ b/test/silence_padding_test.cc @@ -136,7 +136,7 @@ BOOST_AUTO_TEST_CASE (silence_padding_test) BOOST_AUTO_TEST_CASE (silence_padding_test2) { shared_ptr film = new_test_film2 ("silence_padding_test2"); - shared_ptr content (new FFmpegContent(private_data / "cars.mov")); + shared_ptr content (new FFmpegContent(TestPaths::private_data / "cars.mov")); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs()); diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc index eefdb4122..a84c27c82 100644 --- a/test/srt_subtitle_test.cc +++ b/test/srt_subtitle_test.cc @@ -105,7 +105,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test3) film->set_name ("frobozz"); film->set_interop (true); film->set_audio_channels (6); - shared_ptr content (new StringTextFileContent(private_data / "Ankoemmling_short.srt")); + shared_ptr content (new StringTextFileContent(TestPaths::private_data / "Ankoemmling_short.srt")); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs()); @@ -115,7 +115,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test3) film->make_dcp (); BOOST_REQUIRE (!wait_for_jobs()); - check_subtitle_file (film, private_data / "Ankoemmling_short.xml"); + check_subtitle_file (film, TestPaths::private_data / "Ankoemmling_short.xml"); } /** Build a small DCP with no picture and a single subtitle overlaid onto it */ diff --git a/test/ssa_subtitle_test.cc b/test/ssa_subtitle_test.cc index c61d34b71..a7b27e2f3 100644 --- a/test/ssa_subtitle_test.cc +++ b/test/ssa_subtitle_test.cc @@ -47,7 +47,7 @@ BOOST_AUTO_TEST_CASE (ssa_subtitle_test1) film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); film->set_name ("frobozz"); film->set_interop (true); - shared_ptr content (new StringTextFileContent(private_data / "DKH_UT_EN20160601def.ssa")); + shared_ptr content (new StringTextFileContent(TestPaths::private_data / "DKH_UT_EN20160601def.ssa")); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs()); @@ -60,5 +60,5 @@ BOOST_AUTO_TEST_CASE (ssa_subtitle_test1) /* Find the subtitle file and check it */ list ignore; ignore.push_back ("SubtitleID"); - check_xml (subtitle_file(film), private_data / "DKH_UT_EN20160601def.xml", ignore); + check_xml (subtitle_file(film), TestPaths::private_data / "DKH_UT_EN20160601def.xml", ignore); } diff --git a/test/subtitle_charset_test.cc b/test/subtitle_charset_test.cc index 29dabe4bb..9247aec4a 100644 --- a/test/subtitle_charset_test.cc +++ b/test/subtitle_charset_test.cc @@ -33,7 +33,7 @@ using boost::dynamic_pointer_cast; BOOST_AUTO_TEST_CASE (subtitle_charset_test1) { shared_ptr film = new_test_film2 ("subtitle_charset_test1"); - shared_ptr content = content_factory (private_data / "PADDINGTON soustitresVFdef.srt").front(); + shared_ptr content = content_factory (TestPaths::private_data / "PADDINGTON soustitresVFdef.srt").front(); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs ()); } diff --git a/test/test.cc b/test/test.cc index b111a3b6b..8f92024fc 100644 --- a/test/test.cc +++ b/test/test.cc @@ -71,7 +71,7 @@ using boost::shared_ptr; using boost::scoped_array; using boost::dynamic_pointer_cast; -boost::filesystem::path private_data = boost::filesystem::canonical(boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private")); +boost::filesystem::path TestPaths::TestPaths::private_data = boost::filesystem::canonical(boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private")); boost::filesystem::path TestPaths::xsd = boost::filesystem::canonical(boost::filesystem::path("..") / boost::filesystem::path("libdcp") / boost::filesystem::path("xsd")); void @@ -114,7 +114,7 @@ struct TestConfig char* env_private = getenv("DCPOMATIC_TEST_PRIVATE"); if (env_private) { - private_data = env_private; + TestPaths::TestPaths::private_data = env_private; } dcpomatic_log.reset (new FileLog("build/test/log")); diff --git a/test/test.h b/test/test.h index c94bad595..8ccebb5fe 100644 --- a/test/test.h +++ b/test/test.h @@ -24,11 +24,11 @@ class Film; class Image; -extern boost::filesystem::path private_data; class TestPaths { public: + static boost::filesystem::path private_data; static boost::filesystem::path xsd; }; diff --git a/test/threed_test.cc b/test/threed_test.cc index c87356171..473cc00d3 100644 --- a/test/threed_test.cc +++ b/test/threed_test.cc @@ -110,9 +110,9 @@ BOOST_AUTO_TEST_CASE (threed_test4) Config::instance()->set_master_encoding_threads (8); shared_ptr film = new_test_film2 ("threed_test4"); - shared_ptr L (new FFmpegContent(private_data / "LEFT_TEST_DCP3D4K.mov")); + shared_ptr L (new FFmpegContent(TestPaths::private_data / "LEFT_TEST_DCP3D4K.mov")); film->examine_and_add_content (L); - shared_ptr R (new FFmpegContent(private_data / "RIGHT_TEST_DCP3D4K.mov")); + shared_ptr R (new FFmpegContent(TestPaths::private_data / "RIGHT_TEST_DCP3D4K.mov")); film->examine_and_add_content (R); BOOST_REQUIRE (!wait_for_jobs()); @@ -133,9 +133,9 @@ BOOST_AUTO_TEST_CASE (threed_test5) Config::instance()->set_master_encoding_threads (8); shared_ptr film = new_test_film2 ("threed_test5"); - shared_ptr L (new FFmpegContent(private_data / "boon_telly.mkv")); + shared_ptr L (new FFmpegContent(TestPaths::private_data / "boon_telly.mkv")); film->examine_and_add_content (L); - shared_ptr R (new FFmpegContent(private_data / "boon_telly.mkv")); + shared_ptr R (new FFmpegContent(TestPaths::private_data / "boon_telly.mkv")); film->examine_and_add_content (R); BOOST_REQUIRE (!wait_for_jobs()); -- 2.30.2