summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-10-10 12:18:11 +0200
committerCarl Hetherington <cth@carlh.net>2021-10-10 12:18:11 +0200
commit805d4a48fa6e4d8e28fd582a2ae6ba78b8343144 (patch)
tree8c522c5e00479606976329683bcaa04b30e9f880
parent7647290fbaa81e25875758597f7cbbeca19f80bc (diff)
Fix a test reference to account for windows filename slashes.
-rw-r--r--test/config_test.cc5
m---------test/data0
2 files changed, 5 insertions, 0 deletions
diff --git a/test/config_test.cc b/test/config_test.cc
index 2fd6fe4aa..035d77828 100644
--- a/test/config_test.cc
+++ b/test/config_test.cc
@@ -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"));
diff --git a/test/data b/test/data
-Subproject 20f8eb1486ab297eec9f3a7312833354f5b506e
+Subproject 9e3e504fdb8c254e2fef5f29159328ef1e67381