X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fconfig_test.cc;h=035d778281936f9ddc3f4eb7de119d1b5819957b;hb=5cf687959afd75b0251b87d742b1594f6a8a7991;hp=173c95cbf9c4fe1cc778b221cead0b8b6f6a4798;hpb=6e3e984162ca7a181bc7c98d90c295e88e4e7f6c;p=dcpomatic.git

diff --git a/test/config_test.cc b/test/config_test.cc
index 173c95cbf..035d77828 100644
--- a/test/config_test.cc
+++ b/test/config_test.cc
@@ -124,12 +124,22 @@ BOOST_AUTO_TEST_CASE (config_upgrade_test)
 	boost::filesystem::copy_file ("test/data/2.14.config.xml", dir / "config.xml");
 	boost::filesystem::copy_file ("test/data/2.14.cinemas.xml", dir / "cinemas.xml");
 	Config::instance();
-	Config::instance()->write();
+	try {
+		/* This will fail to write cinemas.xml since the link is to a non-existant directory */
+		Config::instance()->write();
+	} catch (...) {}
 
 	check_xml (dir / "config.xml", "test/data/2.14.config.xml", {});
 	check_xml (dir / "cinemas.xml", "test/data/2.14.cinemas.xml", {});
+#ifdef DCPOMATIC_WINDOWS
+	/* This file has the windows path for dkdm_recipients.xml (with backslashes) */
+	check_xml (dir / "2.16" / "config.xml", "test/data/2.16.config.windows.xml", {});
+#else
 	check_xml (dir / "2.16" / "config.xml", "test/data/2.16.config.xml", {});
+#endif
 	/* cinemas.xml is not copied into 2.16 as its format has not changed */
 	BOOST_REQUIRE (!boost::filesystem::exists(dir / "2.16" / "cinemas.xml"));
+
+	setup_test_config();
 }