Fix a test reference to account for windows filename slashes.
authorCarl Hetherington <cth@carlh.net>
Sun, 10 Oct 2021 10:18:11 +0000 (12:18 +0200)
committerCarl Hetherington <cth@carlh.net>
Sun, 10 Oct 2021 10:18:11 +0000 (12:18 +0200)
test/config_test.cc
test/data

index 2fd6fe4aa8b6e1917fb395d3ee7a997b4cc3fb0b..035d778281936f9ddc3f4eb7de119d1b5819957b 100644 (file)
@@ -131,7 +131,12 @@ BOOST_AUTO_TEST_CASE (config_upgrade_test)
 
        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"));
 
index 20f8eb1486ab297eec9f3a7312833354f5b506e2..9e3e504fdb8c254e2fef5f29159328ef1e673812 160000 (submodule)
--- a/test/data
+++ b/test/data
@@ -1 +1 @@
-Subproject commit 20f8eb1486ab297eec9f3a7312833354f5b506e2
+Subproject commit 9e3e504fdb8c254e2fef5f29159328ef1e673812