From 805d4a48fa6e4d8e28fd582a2ae6ba78b8343144 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 10 Oct 2021 12:18:11 +0200 Subject: [PATCH] Fix a test reference to account for windows filename slashes. --- test/config_test.cc | 5 +++++ test/data | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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 index 20f8eb148..9e3e504fd 160000 --- a/test/data +++ b/test/data @@ -1 +1 @@ -Subproject commit 20f8eb1486ab297eec9f3a7312833354f5b506e2 +Subproject commit 9e3e504fdb8c254e2fef5f29159328ef1e673812 -- 2.30.2