diff options
| author | Erland Schönbeck <[email protected]> | 2015-03-25 09:51:42 +0100 |
|---|---|---|
| committer | Erland Schönbeck <[email protected]> | 2015-03-25 09:51:42 +0100 |
| commit | 3d184db38d2389c463dd3ad88c34992f8427f30d (patch) | |
| tree | a5ba19f024dd7ce12d92f4f82841ce4c671286c3 /erts | |
| parent | a48186ef9de62ef412327bb4dafe7d50d9278f71 (diff) | |
| parent | 137d68ce8d9f68c2f80f246e7b5f65e38e699323 (diff) | |
| download | otp-3d184db38d2389c463dd3ad88c34992f8427f30d.tar.gz otp-3d184db38d2389c463dd3ad88c34992f8427f30d.tar.bz2 otp-3d184db38d2389c463dd3ad88c34992f8427f30d.zip | |
Merge branch 'erland/diameter/time_api_change/OTP-12439' into maint
* erland/diameter/time_api_change/OTP-12439:
Update with changes in new time api otp_SUITE: change filter för diameter
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/test/otp_SUITE.erl | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/erts/test/otp_SUITE.erl b/erts/test/otp_SUITE.erl index 171f722357..2969383d66 100644 --- a/erts/test/otp_SUITE.erl +++ b/erts/test/otp_SUITE.erl @@ -220,12 +220,10 @@ gs_filter(Undef) -> diameter_filter(Undef) -> %% Filter away function calls that are catched. - filter(fun({{diameter_lib,_,_},{erlang,convert_time_resolution,3}}) -> + filter(fun({{diameter_lib,_,_},{erlang,convert_time_unit,3}}) -> false; ({{diameter_lib,_,_},{erlang,monotonic_time,0}}) -> false; - ({{diameter_lib,_,_},{erlang,time_resolution,0}}) -> - false; ({{diameter_lib,_,_},{erlang,unique_integer,0}}) -> false; ({{diameter_lib,_,_},{erlang,time_offset,0}}) -> |