From 31cede5582d113b41c3d17f3943d62c3f91e1201 Mon Sep 17 00:00:00 2001 From: Milo Davis Date: Mon, 2 Oct 2017 15:12:55 +0200 Subject: [PATCH] Test: fixes relative paths issue on OSX (https://github.com/tezos/tezos/issues/117) --- test/proto_alpha/proto_alpha_helpers.ml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test/proto_alpha/proto_alpha_helpers.ml b/test/proto_alpha/proto_alpha_helpers.ml index 9d56b5d42..779f3374e 100644 --- a/test/proto_alpha/proto_alpha_helpers.ml +++ b/test/proto_alpha/proto_alpha_helpers.ml @@ -35,11 +35,17 @@ let activate_alpha () = fitness dictator_sk let init ?(sandbox = "sandbox.json") () = - Unix.chdir (Filename.dirname (Filename.dirname Sys.executable_name)) ; + (* Handles relative path on OSX *) + let executable_path = + if Filename.is_relative Sys.argv.(0) + then Filename.concat (Sys.getcwd ()) Sys.argv.(0) + else Sys.argv.(0) in + Unix.chdir (Filename.dirname executable_path) ; + Unix.chdir ".." ; let pid = Node_helpers.fork_node ~port:rpc_config.port - ~sandbox:(Filename.dirname Sys.executable_name // sandbox) + ~sandbox:(Filename.dirname executable_path // sandbox) () in activate_alpha () >>=? fun hash -> return (pid, hash)