aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorTristan Sloughter <[email protected]>2019-05-20 13:52:08 -0600
committerGitHub <[email protected]>2019-05-20 13:52:08 -0600
commitececf1ff9e362571637fb05ab1eea854e2ecf839 (patch)
tree7cd85b1fad904713470c6c94ea60ff2e70242ce5 /test
parent407b0250ce73c8e2071ea2526e01ecfaf4fe841d (diff)
parentfcc0fa766606fec55c201ba96cf3d3aa3a0937ca (diff)
downloadrelx-ececf1ff9e362571637fb05ab1eea854e2ecf839.tar.gz
relx-ececf1ff9e362571637fb05ab1eea854e2ecf839.tar.bz2
relx-ececf1ff9e362571637fb05ab1eea854e2ecf839.zip
Merge pull request #667 from ElectronicRU/overlay-wildcards
Support wildcards for copy/link to a directory.
Diffstat (limited to 'test')
-rw-r--r--test/rlx_extended_bin_SUITE.erl5
-rw-r--r--test/rlx_release_SUITE.erl2
2 files changed, 2 insertions, 5 deletions
diff --git a/test/rlx_extended_bin_SUITE.erl b/test/rlx_extended_bin_SUITE.erl
index 8444cb4..710d2c4 100644
--- a/test/rlx_extended_bin_SUITE.erl
+++ b/test/rlx_extended_bin_SUITE.erl
@@ -1298,10 +1298,7 @@ custom_start_script_hooks(Config) ->
]}
]},
{mkdir, "scripts"},
- {overlay, [{copy, "./pre_start", "bin/hooks/pre_start"},
- {copy, "./post_start", "bin/hooks/post_start"},
- {copy, "./pre_stop", "bin/hooks/pre_stop"},
- {copy, "./post_stop", "bin/hooks/post_stop"}]}
+ {overlay, [{copy, "./{pre,post}_{start,stop}", "bin/hooks/"}]}
]),
%% write the hook scripts, each of them will write an erlang term to a file
diff --git a/test/rlx_release_SUITE.erl b/test/rlx_release_SUITE.erl
index 3d77732..a582526 100644
--- a/test/rlx_release_SUITE.erl
+++ b/test/rlx_release_SUITE.erl
@@ -765,7 +765,7 @@ overlay_release(Config) ->
{mkdir, "{{target_dir}}/{{var_list_dir}}"},
{copy, OverlayVars1,
"{{target_dir}}/{{foo_dir}}/vars1.config"},
- {copy, OverlayVars1,
+ {copy, filename:join([LibDir1, "vars1*.config"]),
"{{target_dir}}/{{yahoo}}/"},
{link, OverlayVars4,
"{{target_dir}}/{{yahoo}}/vars4.config"},