diff options
author | AlexSedov <[email protected]> | 2018-07-27 15:19:11 +0300 |
---|---|---|
committer | AlexSedov <[email protected]> | 2018-07-27 15:19:11 +0300 |
commit | eab72217378e06711d3b825944a1f5b0d0f29f95 (patch) | |
tree | 4f2590f0bba76f2ec7ea8f711f09dd90db4bc707 /test | |
parent | b69658a37a0cf62a45bc0de89551344b2cf38595 (diff) | |
download | relx-eab72217378e06711d3b825944a1f5b0d0f29f95.tar.gz relx-eab72217378e06711d3b825944a1f5b0d0f29f95.tar.bz2 relx-eab72217378e06711d3b825944a1f5b0d0f29f95.zip |
Support wildcards for copy/link to a directory.
Additionally, removes a lot of unnecessary conversions to binary in
relx_prv_overlay (binary and string in Erlang are two different beasts
for filenames), and factors out some common code.
Diffstat (limited to 'test')
-rw-r--r-- | test/rlx_extended_bin_SUITE.erl | 5 | ||||
-rw-r--r-- | test/rlx_release_SUITE.erl | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/test/rlx_extended_bin_SUITE.erl b/test/rlx_extended_bin_SUITE.erl index 86a9d23..d8e74f2 100644 --- a/test/rlx_extended_bin_SUITE.erl +++ b/test/rlx_extended_bin_SUITE.erl @@ -1294,10 +1294,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 affc0ad..eca5f78 100644 --- a/test/rlx_release_SUITE.erl +++ b/test/rlx_release_SUITE.erl @@ -669,7 +669,7 @@ overlay_release(Config) -> {overlay, [{mkdir, "{{target_dir}}/fooo"}, {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"}, |