aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2015-03-22 09:45:08 +0100
committerAnders Svensson <[email protected]>2015-03-22 09:45:08 +0100
commit90f97f3e17acb63bfae2e07646cfaf098ed3dbdd (patch)
tree22f910637ef9c5478527d90afabc50b930cc67cc
parent581e3f40954e58f0fc2ec50fc43ecca08a8e4b09 (diff)
parent955dc3a824e8ceaace25196574902eab93a53454 (diff)
downloadotp-90f97f3e17acb63bfae2e07646cfaf098ed3dbdd.tar.gz
otp-90f97f3e17acb63bfae2e07646cfaf098ed3dbdd.tar.bz2
otp-90f97f3e17acb63bfae2e07646cfaf098ed3dbdd.zip
Merge branch 'anders/diameter/17/time/OTP-12439' into maint
* anders/diameter/17/time/OTP-12439: Adapt app suite to changes in time api
-rw-r--r--lib/diameter/test/diameter_app_SUITE.erl9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/diameter/test/diameter_app_SUITE.erl b/lib/diameter/test/diameter_app_SUITE.erl
index cf34c762e1..6975e83830 100644
--- a/lib/diameter/test/diameter_app_SUITE.erl
+++ b/lib/diameter/test/diameter_app_SUITE.erl
@@ -226,15 +226,18 @@ ignored({FromMod,_,_}, {ToMod,_,_} = To, Rel)->
%% New time api in OTP 18.
time_api() ->
- [{erlang, F, A} || {F,A} <- [{convert_time_resolution,3},
+ [{erlang, F, A} || {F,A} <- [{convert_time_unit,3},
{monotonic_time,0},
{monotonic_time,1},
+ {system_time,0},
+ {system_time,1},
{time_offset,0},
{time_offset,1},
- {time_resolution,0},
{timestamp,0},
{unique_integer,0},
- {unique_integer,1}]].
+ {unique_integer,1}]]
+ ++ [{os, system_time, 0},
+ {os, system_time, 1}].
release() ->
Rel = erlang:system_info(otp_release),