diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-03-03 20:51:48 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-03-08 00:12:07 +0100 |
| commit | 3f2675aab119e55f958563e2fe6949192a2b976d (patch) | |
| tree | 2ed8c7e2a0eb7147ab9b798e934d1f7a4ce453a9 /test | |
| parent | f180d199dcb0217ea9750ab0a788217689733c41 (diff) | |
Don't use an optional for the Grok config object.
I'm not sure why I did it like this in the first place - perhaps so that
if the API endpoint changes there aren't so many old values stuck in
config files all over the place? Anyway, it seems cleaner to do it like
this, as it's how we handle the other config.
Diffstat (limited to 'test')
| -rw-r--r-- | test/config_test.cc | 9 | ||||
| m--------- | test/data | 0 |
2 files changed, 7 insertions, 2 deletions
diff --git a/test/config_test.cc b/test/config_test.cc index a9b95bedf..8fd19b693 100644 --- a/test/config_test.cc +++ b/test/config_test.cc @@ -182,9 +182,11 @@ BOOST_AUTO_TEST_CASE (config_upgrade_test1) 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 +#if defined(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.sqlite.xml", {}); +#elif defined(DCPOMATIC_GROK) + check_xml(dir / "2.18" / "config.xml", "test/data/2.18.config.sqlite.grok.xml", {}); #else check_xml(dir / "2.18" / "config.xml", "test/data/2.18.config.sqlite.xml", {}); #endif @@ -215,10 +217,13 @@ BOOST_AUTO_TEST_CASE (config_upgrade_test2) Config::instance()->write(); check_xml(dir / "cinemas.xml", "test/data/2.14.cinemas.xml", {}); -#ifdef DCPOMATIC_WINDOWS +#if defined(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", {}); +#elif defined(DCPOMATIC_GROK) + check_xml(dir / "2.18" / "config.xml", "test/data/2.18.config.grok.xml", {}); + check_xml(dir / "config.xml", "test/data/2.16.config.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", {}); diff --git a/test/data b/test/data -Subproject df601f1580d852de043c2eca6acc4cfc9a2446b +Subproject 7d2ed165d8e65d92a02a20e22c1caedd15db82b |