Merge master.

2 files changed, 5 insertions, 1 deletions

diff --git a/test/private b/test/private
deleted file mode 160000
-Subproject b1b56652bd67e74817e02933412190b33d4823b
diff --git a/test/test.cc b/test/test.cc
index 0b56b903..995a5b23 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -25,11 +25,16 @@
 
 using std::string;
 
+string private_test;
+
 struct TestConfig
 {
 	TestConfig()
 	{
 		dcp::init ();
+		if (boost::unit_test::framework::master_test_suite().argc >= 2) {
+			private_test = boost::unit_test::framework::master_test_suite().argv[1];
+		}
 	}
 };
 
@@ -47,5 +52,4 @@ wav (dcp::Channel)
 	return "test/data/1s_24-bit_48k_silence.wav";
 }
 
-string private_test = "test/private";