From d1f1c8dc134cb1d4c832cfb0171ca7b859a2a600 Mon Sep 17 00:00:00 2001 From: Luis Rascao Date: Thu, 19 Feb 2015 11:05:49 +0000 Subject: support overlay file inclusion allow overlay inclusion of other files, similarly to what OTP already does in sys.config files --- test/rlx_release_SUITE.erl | 10 +++++++++- test/rlx_test_utils.erl | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/rlx_release_SUITE.erl b/test/rlx_release_SUITE.erl index eeab491..766eb40 100644 --- a/test/rlx_release_SUITE.erl +++ b/test/rlx_release_SUITE.erl @@ -471,6 +471,7 @@ overlay_release(Config) -> ConfigFile = filename:join([LibDir1, "relx.config"]), OverlayVars1 = filename:join([LibDir1, "vars1.config"]), OverlayVars2 = filename:join([LibDir1, "vars2.config"]), + OverlayVars3 = filename:join([LibDir1, "vars3.config"]), Template = filename:join([LibDir1, "test_template"]), TestDir = "first_test_dir", TestFile = "test_file", @@ -502,7 +503,12 @@ overlay_release(Config) -> VarsFile2 = filename:join([LibDir1, "vars2.config"]), rlx_test_utils:write_config(VarsFile2, [{google, "yahoo"}, - {yahoo2, [{foo, "foo"}]}]), + {yahoo2, [{foo, "foo"}]}, + OverlayVars3]), + + VarsFile3 = filename:join([LibDir1, "vars3.config"]), + rlx_test_utils:write_config(VarsFile3, [{google, "yahoo"}, + {yahoo4, [{foo, "{{yahoo}}/{{yahoo2.foo}}4"}]}]), ok = rlx_util:mkdir_p(TestDirFull), ok = file:write_file(TestFileFull, rlx_test_utils:test_template_contents()), @@ -604,6 +610,8 @@ overlay_release(Config) -> proplists:get_value(foo_dir, TemplateData)), ?assertEqual("yahoo/foo", proplists:get_value(yahoo3, TemplateData)), + ?assertEqual("yahoo/foo4", + proplists:get_value(yahoo4, TemplateData)), ?assertEqual("yahoo", proplists:get_value(google, TemplateData)). diff --git a/test/rlx_test_utils.erl b/test/rlx_test_utils.erl index 0428966..644c49f 100644 --- a/test/rlx_test_utils.erl +++ b/test/rlx_test_utils.erl @@ -94,4 +94,5 @@ test_template_contents() -> "{yahoo2_foo, \"{{yahoo2.foo}}\"}.\n" "{foo_dir, \"{{foo_dir}}\"}.\n" "{yahoo3, \"{{yahoo3.bar}}\"}.\n" + "{yahoo4, \"{{yahoo4.foo}}\"}.\n" "{google, \"{{google}}\"}.\n". -- cgit v1.2.3