Fix use of DCPOMATIC_TEST_PRIVATE variable to specify where

test private data is.

25 files changed, 75 insertions, 64 deletions

diff --git a/test/atmos_test.cc b/test/atmos_test.cc
index e5846f20e..fe64ed6a9 100644
--- a/test/atmos_test.cc
+++ b/test/atmos_test.cc
@@ -38,8 +38,8 @@ using boost::shared_ptr;
 BOOST_AUTO_TEST_CASE (atmos_passthrough_test)
 {
 	shared_ptr<Film> film = new_test_film2 ("atmos_passthrough_test");
-	boost::filesystem::path ref = TestPaths::private_data / "atmos_asset.mxf";
-	shared_ptr<Content> content = content_factory (TestPaths::private_data / "atmos_asset.mxf").front();
+	boost::filesystem::path ref = TestPaths::private_data() / "atmos_asset.mxf";
+	shared_ptr<Content> content = content_factory (TestPaths::private_data() / "atmos_asset.mxf").front();
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
 
@@ -53,8 +53,8 @@ BOOST_AUTO_TEST_CASE (atmos_passthrough_test)
 BOOST_AUTO_TEST_CASE (atmos_encrypted_passthrough_test)
 {
 	shared_ptr<Film> film = new_test_film2 ("atmos_encrypted_passthrough_test");
-	boost::filesystem::path ref = TestPaths::private_data / "atmos_asset.mxf";
-	shared_ptr<Content> content = content_factory (TestPaths::private_data / "atmos_asset.mxf").front();
+	boost::filesystem::path ref = TestPaths::private_data() / "atmos_asset.mxf";
+	shared_ptr<Content> content = content_factory (TestPaths::private_data() / "atmos_asset.mxf").front();
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
 
diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc
index 4613f4aea..5cf8c0271 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 = TestPaths::private_data / "betty_L.wav";
+	boost::filesystem::path p = TestPaths::private_data() / "betty_L.wav";
 
 	shared_ptr<FFmpegContent> 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> film = new_test_film ("audio_analysis_negative_delay_test");
 	film->set_name ("audio_analysis_negative_delay_test");
-	shared_ptr<FFmpegContent> c (new FFmpegContent(TestPaths::private_data / "boon_telly.mkv"));
+	shared_ptr<FFmpegContent> 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> film = new_test_film ("audio_analysis_test2");
 	film->set_name ("audio_analysis_test2");
-	shared_ptr<FFmpegContent> c (new FFmpegContent(TestPaths::private_data / "3d_thx_broadway_2010_lossless.m2ts"));
+	shared_ptr<FFmpegContent> 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 = content_factory(TestPaths::private_data / "20 The Wedding Convoy Song.m4a").front();
+	shared_ptr<Content> content = content_factory(TestPaths::private_data() / "20 The Wedding Convoy Song.m4a").front();
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
 
@@ -207,7 +207,7 @@ BOOST_AUTO_TEST_CASE (analyse_audio_leqm_test)
 {
 	shared_ptr<Film> film = new_test_film2 ("analyse_audio_leqm_test");
 	film->set_audio_channels (2);
-	shared_ptr<Content> content = content_factory(TestPaths::private_data / "betty_stereo_48k.wav").front();
+	shared_ptr<Content> content = content_factory(TestPaths::private_data() / "betty_stereo_48k.wav").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 1e143f8e4..5409ec37d 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 = content_factory(TestPaths::private_data / "demo_sound_bug.mkv").front ();
+	shared_ptr<Content> 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 0f639587b..2cabd0a0b 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> film = new_test_film ("dcp_playback_test");
-	shared_ptr<DCPContent> content (new DCPContent(TestPaths::private_data / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV"));
+	shared_ptr<DCPContent> 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 17b997fbc..e94990798 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<DCPContent> content (new DCPContent(TestPaths::private_data / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV"));
+	shared_ptr<DCPContent> 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 e9b0c7039..6499887e7 100644
--- a/test/ffmpeg_audio_test.cc
+++ b/test/ffmpeg_audio_test.cc
@@ -128,7 +128,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
 BOOST_AUTO_TEST_CASE (ffmpeg_audio_test2)
 {
 	shared_ptr<Film> film = new_test_film2 ("ffmpeg_audio_test2");
-	shared_ptr<Content> content = content_factory(TestPaths::private_data / "wayne.mkv").front();
+	shared_ptr<Content> content = content_factory(TestPaths::private_data() / "wayne.mkv").front();
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
@@ -140,7 +140,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test2)
 BOOST_AUTO_TEST_CASE (ffmpeg_audio_test3)
 {
 	shared_ptr<Film> film = new_test_film2 ("ffmpeg_audio_test2");
-	shared_ptr<Content> content = content_factory(TestPaths::private_data / "wayne.mkv").front();
+	shared_ptr<Content> 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 8adcbf8b8..7ee225d51 100644
--- a/test/ffmpeg_decoder_seek_test.cc
+++ b/test/ffmpeg_decoder_seek_test.cc
@@ -67,7 +67,7 @@ check (shared_ptr<FFmpegDecoder> decoder, int frame)
 static void
 test (boost::filesystem::path file, vector<int> frames)
 {
-	boost::filesystem::path path = TestPaths::private_data / file;
+	boost::filesystem::path path = TestPaths::private_data() / file;
 	BOOST_REQUIRE (boost::filesystem::exists (path));
 
 	shared_ptr<Film> 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 d761d9465..d8293b6fe 100644
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -57,7 +57,7 @@ check (shared_ptr<PlayerVideo>, DCPTime time)
 void
 ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int video_length)
 {
-	boost::filesystem::path path = TestPaths::private_data / file;
+	boost::filesystem::path path = TestPaths::private_data() / file;
 	BOOST_REQUIRE (boost::filesystem::exists (path));
 
 	shared_ptr<Film> 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 178ed5296..1b030ce80 100644
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/ffmpeg_encoder_test.cc
@@ -88,19 +88,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, TestPaths::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, TestPaths::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, TestPaths::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 */
@@ -108,7 +108,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test5)
 {
 	shared_ptr<Film> film = new_test_film ("ffmpeg_encoder_prores_test5");
 	film->set_name ("ffmpeg_encoder_prores_test5");
-	shared_ptr<ImageContent> c (new ImageContent(TestPaths::private_data / "bbc405.png"));
+	shared_ptr<ImageContent> c (new ImageContent(TestPaths::private_data() / "bbc405.png"));
 	film->set_container (Ratio::from_id ("185"));
 	film->set_audio_channels (6);
 
@@ -322,7 +322,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test5)
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test6)
 {
 	shared_ptr<Film> film = new_test_film2 ("ffmpeg_encoder_h264_test6_ov");
-	film->examine_and_add_content (shared_ptr<ImageContent>(new ImageContent(TestPaths::private_data / "bbc405.png")));
+	film->examine_and_add_content (shared_ptr<ImageContent>(new ImageContent(TestPaths::private_data() / "bbc405.png")));
 	BOOST_REQUIRE (!wait_for_jobs());
 	film->make_dcp ();
 	BOOST_REQUIRE (!wait_for_jobs());
@@ -352,9 +352,9 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test6)
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test7)
 {
 	shared_ptr<Film> film = new_test_film2 ("ffmpeg_encoder_h264_test7_data");
-	shared_ptr<Content> L (shared_ptr<ImageContent>(new ImageContent(TestPaths::private_data / "bbc405.png")));
+	shared_ptr<Content> L (shared_ptr<ImageContent>(new ImageContent(TestPaths::private_data() / "bbc405.png")));
 	film->examine_and_add_content (L);
-	shared_ptr<Content> R (shared_ptr<ImageContent>(new ImageContent(TestPaths::private_data / "bbc405.png")));
+	shared_ptr<Content> R (shared_ptr<ImageContent>(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);
@@ -403,7 +403,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test9)
 {
 	shared_ptr<Film> film = new_test_film ("ffmpeg_encoder_prores_test9");
 	film->set_name ("ffmpeg_encoder_prores_test9");
-	shared_ptr<ImageContent> c (new ImageContent(TestPaths::private_data / "bbc405.png"));
+	shared_ptr<ImageContent> c (new ImageContent(TestPaths::private_data() / "bbc405.png"));
 	film->set_container (Ratio::from_id ("185"));
 	film->set_audio_channels (12);
 
diff --git a/test/ffmpeg_examiner_test.cc b/test/ffmpeg_examiner_test.cc
index e83b20c54..04e6f2535 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<FFmpegContent> content (new FFmpegContent(TestPaths::private_data / "RockyTop10 Playlist Flat.m4v"));
+	shared_ptr<FFmpegContent> content (new FFmpegContent(TestPaths::private_data() / "RockyTop10 Playlist Flat.m4v"));
 	shared_ptr<FFmpegExaminer> 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 820a44e88..bdd34c665 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<FFmpegImageProxy> proxy (new FFmpegImageProxy (TestPaths::private_data / "prophet_frame.tiff"));
+	shared_ptr<FFmpegImageProxy> proxy (new FFmpegImageProxy (TestPaths::private_data() / "prophet_frame.tiff"));
 	shared_ptr<Image> raw = proxy->image().image;
 	shared_ptr<Image> 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<Image> 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");
-	check_image ("build/test/image_test_" + suffix + ".png", TestPaths::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 ddad2ee77..584f82987 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<FFmpegContent> content (new FFmpegContent(TestPaths::private_data / "prophet_long_clip.mkv"));
+	shared_ptr<FFmpegContent> 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 e66cf1829..832f48c3f 100644
--- a/test/j2k_bandwidth_test.cc
+++ b/test/j2k_bandwidth_test.cc
@@ -18,7 +18,7 @@
 
 */
 
-/** @file  test/j2k_bandwidth_test.cc
+/** @file  test/bandwidth_test.cc
  *  @brief Test whether we output whatever J2K bandwidth is requested.
  *  @ingroup specific
  */
@@ -40,12 +40,12 @@ check (int target_bits_per_second)
 {
 	int const duration = 10;
 
-	string const name = "j2k_bandwidth_test_" + dcp::raw_convert<string> (target_bits_per_second);
+	string const name = "bandwidth_test_" + dcp::raw_convert<string> (target_bits_per_second);
 	shared_ptr<Film> film = new_test_film (name);
 	film->set_name (name);
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
 	film->set_j2k_bandwidth (target_bits_per_second);
-	shared_ptr<ImageContent> content (new ImageContent(TestPaths::private_data / "prophet_frame.tiff"));
+	shared_ptr<ImageContent> 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);
@@ -63,7 +63,7 @@ check (int target_bits_per_second)
 	BOOST_CHECK ((actual_bits_per_second / target_bits_per_second) < 1.15);
 }
 
-BOOST_AUTO_TEST_CASE (j2k_bandwidth_test)
+BOOST_AUTO_TEST_CASE (bandwidth_test)
 {
 	check (50000000);
 	check (100000000);
diff --git a/test/no_use_video_test.cc b/test/no_use_video_test.cc
index d2589d123..c5473ae7c 100644
--- a/test/no_use_video_test.cc
+++ b/test/no_use_video_test.cc
@@ -72,8 +72,8 @@ BOOST_AUTO_TEST_CASE (no_use_video_test1)
 BOOST_AUTO_TEST_CASE (no_use_video_test2)
 {
 	shared_ptr<Film> film = new_test_film2 ("no_use_video_test2");
-	shared_ptr<Content> A = content_factory (TestPaths::private_data / "dolby_aurora.vob").front();
-	shared_ptr<Content> B = content_factory (TestPaths::private_data / "big_buck_bunny_trailer_480p.mov").front();
+	shared_ptr<Content> A = content_factory (TestPaths::private_data() / "dolby_aurora.vob").front();
+	shared_ptr<Content> B = content_factory (TestPaths::private_data() / "big_buck_bunny_trailer_480p.mov").front();
 	film->examine_and_add_content (A);
 	film->examine_and_add_content (B);
 	BOOST_REQUIRE (!wait_for_jobs());
diff --git a/test/player_test.cc b/test/player_test.cc
index e52a73e5e..6dd78dbb2 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> film (new Film (optional<boost::filesystem::path>()));
-	shared_ptr<DCPContent> dcp (new DCPContent(TestPaths::private_data / "awkward_subs"));
+	shared_ptr<DCPContent> 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> film (new Film (optional<boost::filesystem::path>()));
-	shared_ptr<DCPContent> dcp (new DCPContent(TestPaths::private_data / "awkward_subs2"));
+	shared_ptr<DCPContent> 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<Sub>* out, PlayerText text, TextType type, optional<DCPTextTrack> tr
 BOOST_AUTO_TEST_CASE (player_ignore_video_and_audio_test)
 {
 	shared_ptr<Film> film = new_test_film2 ("player_ignore_video_and_audio_test");
-	shared_ptr<Content> ff = content_factory(TestPaths::private_data / "boon_telly.mkv").front();
+	shared_ptr<Content> ff = content_factory(TestPaths::private_data() / "boon_telly.mkv").front();
 	film->examine_and_add_content (ff);
 	shared_ptr<Content> 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> film = new_test_film2 ("player_trim_crash");
-	shared_ptr<Content> boon = content_factory(TestPaths::private_data / "boon_telly.mkv").front();
+	shared_ptr<Content> 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/pulldown_detect_test.cc b/test/pulldown_detect_test.cc
index e4f8aa711..e6adb288f 100644
--- a/test/pulldown_detect_test.cc
+++ b/test/pulldown_detect_test.cc
@@ -32,7 +32,7 @@ using boost::shared_ptr;
 BOOST_AUTO_TEST_CASE (pulldown_detect_test1)
 {
 	shared_ptr<Film> film = new_test_film2 ("pulldown_detect_test1");
-	shared_ptr<Content> content = content_factory(TestPaths::private_data / "greatbrain.mkv").front();
+	shared_ptr<Content> content = content_factory(TestPaths::private_data() / "greatbrain.mkv").front();
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
 	BOOST_REQUIRE (static_cast<bool>(content->video_frame_rate()));
diff --git a/test/reels_test.cc b/test/reels_test.cc
index 41e206366..573289718 100644
--- a/test/reels_test.cc
+++ b/test/reels_test.cc
@@ -526,7 +526,7 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short1)
 
 	vector<boost::filesystem::path> dirs;
 	dirs.push_back (film->dir(film->dcp_name(false)));
-	list<dcp::VerificationNote> const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd);
+	list<dcp::VerificationNote> const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd());
 	dump_notes (notes);
 	BOOST_REQUIRE (notes.empty());
 }
@@ -556,7 +556,7 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short2)
 
 	vector<boost::filesystem::path> dirs;
 	dirs.push_back (film->dir(film->dcp_name(false)));
-	list<dcp::VerificationNote> const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd);
+	list<dcp::VerificationNote> const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd());
 	dump_notes (notes);
 	BOOST_REQUIRE (notes.empty());
 }
@@ -580,7 +580,7 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short3)
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	vector<boost::filesystem::path> dirs;
-	list<dcp::VerificationNote> const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd);
+	list<dcp::VerificationNote> const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd());
 	dump_notes (notes);
 	BOOST_REQUIRE (notes.empty());
 }
@@ -610,7 +610,7 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short4)
 
 	vector<boost::filesystem::path> dirs;
 	dirs.push_back (film->dir(film->dcp_name(false)));
-	list<dcp::VerificationNote> const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd);
+	list<dcp::VerificationNote> const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd());
 	dump_notes (notes);
 	BOOST_REQUIRE (notes.empty());
 }
diff --git a/test/remake_with_subtitle_test.cc b/test/remake_with_subtitle_test.cc
index 2321653d9..27d76ed31 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> film = new_test_film2 ("remake_with_subtitle_test");
-	shared_ptr<FFmpegContent> content = dynamic_pointer_cast<FFmpegContent>(content_factory(TestPaths::private_data / "prophet_short_clip.mkv").front());
+	shared_ptr<FFmpegContent> content = dynamic_pointer_cast<FFmpegContent>(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, TestPaths::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 dcabf2955..75abd0284 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> film = new_test_film2 ("silence_padding_test2");
-	shared_ptr<FFmpegContent> content (new FFmpegContent(TestPaths::private_data / "cars.mov"));
+	shared_ptr<FFmpegContent> 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 a84c27c82..5fbe3058d 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<StringTextFileContent> content (new StringTextFileContent(TestPaths::private_data / "Ankoemmling_short.srt"));
+	shared_ptr<StringTextFileContent> 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, TestPaths::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 a7b27e2f3..bb37358f1 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<StringTextFileContent> content (new StringTextFileContent(TestPaths::private_data / "DKH_UT_EN20160601def.ssa"));
+	shared_ptr<StringTextFileContent> 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<string> ignore;
 	ignore.push_back ("SubtitleID");
-	check_xml (subtitle_file(film), TestPaths::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 9247aec4a..67bde8927 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> film = new_test_film2 ("subtitle_charset_test1");
-	shared_ptr<Content> content = content_factory (TestPaths::private_data / "PADDINGTON soustitresVFdef.srt").front();
+	shared_ptr<Content> 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 5aee44230..a576ee0c0 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -72,8 +72,24 @@ using boost::shared_ptr;
 using boost::scoped_array;
 using boost::dynamic_pointer_cast;
 
-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"));
+
+boost::filesystem::path
+TestPaths::TestPaths::private_data ()
+{
+	char* env = getenv("DCPOMATIC_TEST_PRIVATE");
+	if (env) {
+		return boost::filesystem::path(env);
+	}
+
+	return boost::filesystem::canonical(boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private"));
+}
+
+
+boost::filesystem::path TestPaths::xsd ()
+{
+	return boost::filesystem::canonical(boost::filesystem::path("..") / boost::filesystem::path("libdcp") / boost::filesystem::path("xsd"));
+}
+
 
 void
 setup_test_config ()
@@ -118,11 +134,6 @@ struct TestConfig
 
 		signal_manager = new TestSignalManager ();
 
-		char* env_private = getenv("DCPOMATIC_TEST_PRIVATE");
-		if (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 aa58aac09..4968d3301 100644
--- a/test/test.h
+++ b/test/test.h
@@ -30,8 +30,8 @@ class Log;
 class TestPaths
 {
 public:
-	static boost::filesystem::path private_data;
-	static boost::filesystem::path xsd;
+	static boost::filesystem::path private_data();
+	static boost::filesystem::path xsd();
 };
 
 extern bool wait_for_jobs ();
diff --git a/test/threed_test.cc b/test/threed_test.cc
index ce1df88e3..ed512e298 100644
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -106,9 +106,9 @@ BOOST_AUTO_TEST_CASE (threed_test3)
 BOOST_AUTO_TEST_CASE (threed_test4)
 {
 	shared_ptr<Film> film = new_test_film2 ("threed_test4");
-	shared_ptr<FFmpegContent> L (new FFmpegContent(TestPaths::private_data / "LEFT_TEST_DCP3D4K.mov"));
+	shared_ptr<FFmpegContent> L (new FFmpegContent(TestPaths::private_data() / "LEFT_TEST_DCP3D4K.mov"));
 	film->examine_and_add_content (L);
-	shared_ptr<FFmpegContent> R (new FFmpegContent(TestPaths::private_data / "RIGHT_TEST_DCP3D4K.mov"));
+	shared_ptr<FFmpegContent> R (new FFmpegContent(TestPaths::private_data() / "RIGHT_TEST_DCP3D4K.mov"));
 	film->examine_and_add_content (R);
 	BOOST_REQUIRE (!wait_for_jobs());
 
@@ -131,9 +131,9 @@ BOOST_AUTO_TEST_CASE (threed_test4)
 BOOST_AUTO_TEST_CASE (threed_test5)
 {
 	shared_ptr<Film> film = new_test_film2 ("threed_test5");
-	shared_ptr<FFmpegContent> L (new FFmpegContent(TestPaths::private_data / "boon_telly.mkv"));
+	shared_ptr<FFmpegContent> L (new FFmpegContent(TestPaths::private_data() / "boon_telly.mkv"));
 	film->examine_and_add_content (L);
-	shared_ptr<FFmpegContent> R (new FFmpegContent(TestPaths::private_data / "boon_telly.mkv"));
+	shared_ptr<FFmpegContent> R (new FFmpegContent(TestPaths::private_data() / "boon_telly.mkv"));
 	film->examine_and_add_content (R);
 	BOOST_REQUIRE (!wait_for_jobs());