aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Svensson <anders@erlang.org>2016-05-09 16:10:57 +0200
committerAnders Svensson <anders@erlang.org>2016-05-09 16:10:57 +0200
commit4d6d52370bead36c31ba3661a0508c4bedc87e8a (patch)
treee3a658bc5043bfc9f281c92953df0abcbdc22e21
parent72854151006ca4bba903f99fb598fbe244827d5c (diff)
parenta54a9111269371d8e2577b0824dd0351c4a75115 (diff)
downloadotp-4d6d52370bead36c31ba3661a0508c4bedc87e8a.tar.gz
otp-4d6d52370bead36c31ba3661a0508c4bedc87e8a.tar.bz2
otp-4d6d52370bead36c31ba3661a0508c4bedc87e8a.zip
Merge branch 'anders/diameter/test/OTP-13438'
* anders/diameter/test/OTP-13438: Don't assume list comprehension evaluation order
-rw-r--r--lib/diameter/test/diameter_tls_SUITE.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/diameter/test/diameter_tls_SUITE.erl b/lib/diameter/test/diameter_tls_SUITE.erl
index 3784bf20a6..1ad897dcd2 100644
--- a/lib/diameter/test/diameter_tls_SUITE.erl
+++ b/lib/diameter/test/diameter_tls_SUITE.erl
@@ -327,10 +327,10 @@ make_cert(Dir, Keyfile, Certfile) ->
"-subj /C=SE/ST=./L=Stockholm/CN=www.erlang.org"]),
%% Hope for the best and only check that files are written.
- [{_, _, {ok,_}},{_, _, {ok,_}}]
- = [{P,O,T} || {P,C} <- [{KP,KC}, {CP,CC}],
- O <- [os:cmd(C)],
- T <- [file:read_file_info(P)]],
+ KR = os:cmd(KC),
+ {_, {ok, _}} = {KR, file:read_file_info(KP)},
+ CR = os:cmd(CC),
+ {_, {ok, _}} = {CR, file:read_file_info(CP)},
{KP,CP}.