X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fconfig_test.cc;h=884f3cb0867b8b5c90c622a8f53255c1fcdbc236;hb=6b9aeb06323b50fb4d02477f8fcccf8ddad83ad1;hp=062c1849ac331b9ae97e45c0c6bbd0f96ba04b04;hpb=8377ed4386af507038b3d0528c25068ee3275bb7;p=dcpomatic.git

diff --git a/test/config_test.cc b/test/config_test.cc
index 062c1849a..884f3cb08 100644
--- a/test/config_test.cc
+++ b/test/config_test.cc
@@ -208,7 +208,11 @@ BOOST_AUTO_TEST_CASE (config_upgrade_test2)
 	boost::filesystem::remove_all (dir);
 	boost::filesystem::create_directories (dir);
 
+#ifdef DCPOMATIC_WINDOWS
+	boost::filesystem::copy_file("test/data/2.16.config.windows.xml", dir / "config.xml");
+#else
 	boost::filesystem::copy_file("test/data/2.16.config.xml", dir / "config.xml");
+#endif
 	boost::filesystem::copy_file("test/data/2.14.cinemas.xml", dir / "cinemas.xml");
 	Config::instance();
 	try {
@@ -216,13 +220,14 @@ BOOST_AUTO_TEST_CASE (config_upgrade_test2)
 		Config::instance()->write();
 	} catch (...) {}
 
-	check_xml(dir / "config.xml", "test/data/2.16.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.18" / "config.xml", "test/data/2.18.config.windows.xml", {});
+	check_xml(dir / "config.xml", "test/data/2.16.config.windows.xml", {});
 #else
 	check_xml(dir / "2.18" / "config.xml", "test/data/2.18.config.xml", {});
+	check_xml(dir / "config.xml", "test/data/2.16.config.xml", {});
 #endif
 	/* cinemas.xml is not copied into 2.18 as its format has not changed */
 	BOOST_REQUIRE (!boost::filesystem::exists(dir / "2.18" / "cinemas.xml"));