From 257c11219118d46a69fdc2ea32f1a2918b24feeb Mon Sep 17 00:00:00 2001 From: Michael Ries Date: Wed, 4 May 2016 11:48:02 -0600 Subject: [PATCH 1/2] switch js_benchmark to use os:timestamp() since erlang:now() was deprecated in OTP 18 --- src/js_benchmark.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js_benchmark.erl b/src/js_benchmark.erl index 5b92553..071e005 100644 --- a/src/js_benchmark.erl +++ b/src/js_benchmark.erl @@ -38,9 +38,9 @@ run() -> %% @private time_calls(Ctx, Count) -> io:format("Starting: ~p~n", [Count]), - Start = erlang:now(), + Start = os:timestamp(), do_calls(Ctx, Count), - timer:now_diff(erlang:now(), Start) / Count. + timer:now_diff(os:timestamp(), Start) / Count. %% @private do_calls(_Ctx, 0) -> From aaadba89277a8b405ea39f55654a6d8ecd33759b Mon Sep 17 00:00:00 2001 From: Michael Ries Date: Wed, 4 May 2016 11:50:41 -0600 Subject: [PATCH 2/2] add recent erlang versions to the travis build --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5ba2269..ea5c5ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,8 @@ notifications: webhooks: http://basho-engbot.herokuapp.com/travis?key=9b0dc343d8addd889d7a8d64c9b8b48dd22370aa email: eng@basho.com otp_release: + - 18.2.1 + - 17.5 - R15B01 - R15B - R14B04