From: Peter Lemenkov <lemenkov@gmail.com>
Date: Thu, 6 Sep 2018 17:21:00 +0300
Subject: [PATCH] Erlang_js is no longer an application
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
diff --git a/src/riak_kv.app.src b/src/riak_kv.app.src
index 2aec04a4..e78f0f13 100644
--- a/src/riak_kv.app.src
+++ b/src/riak_kv.app.src
@@ -12,7 +12,6 @@
riak_api,
riak_core,
sidejob,
- erlang_js,
mochiweb,
webmachine,
os_mon,
diff --git a/src/riak_kv_test_util.erl b/src/riak_kv_test_util.erl
index aee60c04..a852a59f 100644
--- a/src/riak_kv_test_util.erl
+++ b/src/riak_kv_test_util.erl
@@ -274,7 +274,7 @@ dep_apps(Test, Extra) ->
(_) -> ok
end,
- [sasl, Silencer, goldrush, lager, exometer_core, runtime_tools, erlang_js,
+ [sasl, Silencer, goldrush, lager, exometer_core, runtime_tools,
mochiweb, webmachine, sidejob, poolboy, basho_stats, bitcask,
eleveldb, riak_core, riak_pipe, riak_api, riak_dt, riak_pb, riak_kv,
DefaultSetupFun, Extra].
diff --git a/test/put_fsm_eqc.erl b/test/put_fsm_eqc.erl
index 2a07fd77..4e9ea1bf 100644
--- a/test/put_fsm_eqc.erl
+++ b/test/put_fsm_eqc.erl
@@ -928,11 +928,8 @@ check_puts_sent(ExpectedPuts, VPutResp) ->
%%====================================================================
start_javascript() ->
- application:stop(erlang_js),
application:stop(sasl),
application:start(sasl),
- application:load(erlang_js),
- application:start(erlang_js),
%% Set up the test dir so erlang_js will find put_fsm_precommit.js
TestDir = filename:join([filename:dirname(code:which(?MODULE)), "..", "test"]),
application:set_env(riak_kv, js_source_dir, TestDir),
@@ -941,7 +938,6 @@ start_javascript() ->
ok.
cleanup_javascript() ->
- application:stop(erlang_js),
application:stop(sasl).
-endif. % EQC