projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a test reference to account for windows filename slashes.
[dcpomatic.git]
/
test
/
config_test.cc
diff --git
a/test/config_test.cc
b/test/config_test.cc
index 2fd6fe4aa8b6e1917fb395d3ee7a997b4cc3fb0b..035d778281936f9ddc3f4eb7de119d1b5819957b 100644
(file)
--- 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", {});
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", {});
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"));
/* cinemas.xml is not copied into 2.16 as its format has not changed */
BOOST_REQUIRE (!boost::filesystem::exists(dir / "2.16" / "cinemas.xml"));