diff options
| author | Erland Schönbeck <[email protected]> | 2015-03-25 10:18:51 +0100 |
|---|---|---|
| committer | Erland Schönbeck <[email protected]> | 2015-03-25 10:18:51 +0100 |
| commit | fdd3ac10233e9c70dc127ee93835298eaaf60074 (patch) | |
| tree | 0eefbf03913a502e05c4dd6c72bd439a5c9a2c3a /erts | |
| parent | 5345727d647ea65b7a0417c87b94cf958ef9ee13 (diff) | |
| parent | 3d184db38d2389c463dd3ad88c34992f8427f30d (diff) | |
| download | otp-fdd3ac10233e9c70dc127ee93835298eaaf60074.tar.gz otp-fdd3ac10233e9c70dc127ee93835298eaaf60074.tar.bz2 otp-fdd3ac10233e9c70dc127ee93835298eaaf60074.zip | |
Merge branch 'maint'
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 1e42b5193c..c416e031c2 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}}) -> |