From d8d7838a77cdb5c83e1994452122b5891db599cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Date: Tue, 17 Jan 2017 14:26:24 +0100 Subject: examples_SUITE: Query system to find GNU Make executable ... instead of hard-coding "make". First, we check the value of `$MAKE`. If it's unset, we look for `gmake` in the `$PATH`. If it's missing, we assume it's `make`. This fixes the testsuite where GNU Make is installed as `gmake`. --- test/examples_SUITE.erl | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/test/examples_SUITE.erl b/test/examples_SUITE.erl index afeb78b..6ef5471 100644 --- a/test/examples_SUITE.erl +++ b/test/examples_SUITE.erl @@ -35,6 +35,19 @@ init_per_suite(Config) -> end_per_suite(_) -> ok. +%% Find GNU Make. + +do_find_make_cmd() -> + case os:getenv("MAKE") of + false -> + case os:find_executable("gmake") of + false -> "make"; + Cmd -> Cmd + end; + Cmd -> + Cmd + end. + %% Compile, start and stop releases. do_get_paths(Example0) -> @@ -46,9 +59,10 @@ do_get_paths(Example0) -> {Dir, Rel, Log}. do_compile_and_start(Example) -> + Make = do_find_make_cmd(), {Dir, Rel, _} = do_get_paths(Example), %% TERM=dumb disables relx coloring. - ct:log("~s~n", [os:cmd("cd " ++ Dir ++ " && make distclean && make all TERM=dumb")]), + ct:log("~s~n", [os:cmd("cd " ++ Dir ++ " && " ++ Make ++ " distclean && " ++ Make ++ " all TERM=dumb")]), ct:log("~s~n", [os:cmd(Rel ++ " stop")]), ct:log("~s~n", [os:cmd(Rel ++ " start")]), timer:sleep(2000), -- cgit v1.2.3