Enable code coverage and fix port location logic

basho · Feb 9, 2018 · 2cd3937 · 2cd3937
1 parent 246e63f
commit 2cd3937
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/rebar.config b/rebar.config
@@ -1,6 +1,7 @@
 {port_specs, [{"priv/canola-port", ["c_src/canola-port.c"]}]}.
 
 {port_env, [{"LDFLAGS", "$LDFLAGS -lpam"}]}.
+{cover_enabled, true}.
 
 {plugins, [pc]}.
 

diff --git a/src/canola.erl b/src/canola.erl
@@ -51,5 +51,15 @@ open2(Debug) ->
                _ ->
                    []
            end,
-    Dir = filename:dirname(code:which(?MODULE)),
-    open_port({spawn_executable, Dir++"/../priv/canola-port"}, [{args, Args}, {packet, 4}, exit_status]).
+    PortBin = case code:priv_dir(ebloom) of
+                 {error, bad_name} ->
+                     case code:which(?MODULE) of
+                         Filename when is_list(Filename) ->
+                             filename:join([filename:dirname(Filename),"../priv", "canola-port"]);
+                         _ ->
+                             filename:join("priv", "canola-port")
+                     end;
+                 Dir ->
+                     filename:join(Dir, "canpola-port")
+             end,
+    open_port({spawn_executable, PortBin}, [{args, Args}, {packet, 4}, exit_status]).