aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2020-02-06 12:28:10 +0100
committerLoïc Hoguin <[email protected]>2020-02-10 13:58:38 +0100
commit864f84253886fb62072e0da64565f99b32a49bce (patch)
tree4b99efb9d346eb65d43779db2479e66ba1b59b44 /test
parent62c692fad7ff448ccca3505e1dd40be245cbed53 (diff)
downloadranch-864f84253886fb62072e0da64565f99b32a49bce.tar.gz
ranch-864f84253886fb62072e0da64565f99b32a49bce.tar.bz2
ranch-864f84253886fb62072e0da64565f99b32a49bce.zip
Update Erlang.mk
Update the release upgrade test suite to use the appup from src/ rather than from ebin/.
Diffstat (limited to 'test')
-rw-r--r--test/upgrade_SUITE.erl9
1 files changed, 6 insertions, 3 deletions
diff --git a/test/upgrade_SUITE.erl b/test/upgrade_SUITE.erl
index f3f849e..71b1000 100644
--- a/test/upgrade_SUITE.erl
+++ b/test/upgrade_SUITE.erl
@@ -111,11 +111,14 @@ do_build_relup(Example, CommitOrTag) ->
%% We need Ranch to be fetched first in order to copy the current appup
%% and optionally update its version when we are not on a tag.
ct:log("~s~n", [os:cmd(Make ++ " -C " ++ Dir ++ " deps")]),
- ct:log("~s~n", [os:cmd("cp " ++ Dir ++ "/../../ebin/ranch.appup "
- ++ Dir ++ "/deps/ranch/ebin/")]),
+ ct:log("~s~n", [os:cmd("cp " ++ Dir ++ "/../../src/ranch.appup "
+ ++ Dir ++ "/deps/ranch/src/")]),
case CommitOrTag of
tag -> ok;
commit ->
+ %% Force the rebuild of Ranch.
+ ct:log("~s~n", [os:cmd(Make ++ " -C " ++ Dir ++ "/deps/ranch clean")]),
+ %% Update the Ranch version so that the upgrade can be applied.
ProjectVersion = os:cmd("grep \"PROJECT_VERSION = \" " ++ Dir ++ "/deps/ranch/Makefile"),
ct:log(ProjectVersion),
["PROJECT_VERSION = " ++ Vsn0|_] = string:lexemes(ProjectVersion, "\n"),
@@ -129,7 +132,7 @@ do_build_relup(Example, CommitOrTag) ->
%% The version in the appup must be the same as PROJECT_VERSION.
ct:log("~s~n", [os:cmd(
"sed -i.bak s/\"" ++ Vsn0 ++ "\"/\"" ++ Vsn ++ "\"/ "
- ++ Dir ++ "/deps/ranch/ebin/ranch.appup"
+ ++ Dir ++ "/deps/ranch/src/ranch.appup"
)])
end,
ct:log("~s~n", [os:cmd(Make ++ " -C " ++ Dir ++ " relup")]).