summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlosEDP <me@carlosedp.com>2015-07-04 17:56:38 -0300
committerCarlosEDP <me@carlosedp.com>2015-07-04 17:56:38 -0300
commit9e4bf8a3bad3f46f8094339b38ac880ec1b977d2 (patch)
tree6796865a0452d6a1063fdd457f071b2e350fe621
parent4d2873e3119a87990bc236aa45bfc8ef9a88f29c (diff)
Added version check based on commit https://github.com/ferd/rebar3/commit/74c68478aac948beccc80e68c5ac6a9eb578eceb
-rw-r--r--test/rebar_deps_SUITE.erl11
1 files changed, 7 insertions, 4 deletions
diff --git a/test/rebar_deps_SUITE.erl b/test/rebar_deps_SUITE.erl
index 48ebb7f..73c4980 100644
--- a/test/rebar_deps_SUITE.erl
+++ b/test/rebar_deps_SUITE.erl
@@ -50,11 +50,14 @@ init_per_testcase(http_proxy_settings, Config) ->
]),
rebar_test_utils:init_rebar_state(Config);
init_per_testcase(https_proxy_settings, Config) ->
- {OTPVersion, _} = string:to_integer(erlang:system_info(otp_release)),
- case OTPVersion of
- Vsn when Vsn =< 15 ->
+ SupportsHttpsProxy = case erlang:system_info(otp_release) of
+ "R16"++_ -> true;
+ "R"++_ -> false;
+ _ -> true % 17 and up don't have a "R" in the version
+ end,
+ if not SupportsHttpsProxy ->
{skip, https_proxy_unsupported_before_R16};
- _ ->
+ SupportsHttpsProxy ->
%% Create private rebar.config
Priv = ?config(priv_dir, Config),
GlobalDir = filename:join(Priv, "global"),