diff options
| author | Alexey Romanov <alexey.v.romanov@gmail.com> | 2011-02-21 12:41:20 +0300 |
|---|---|---|
| committer | Alexey Romanov <alexey.v.romanov@gmail.com> | 2011-02-21 12:41:20 +0300 |
| commit | 7dc371d8a3b9a6e2ab9f814c0d2536cf638ceb99 (patch) | |
| tree | 174193ae08d2824164ba99e63f696a6593ee63c6 /inttest | |
| parent | 2ceeb3272139b7569c8dabc215ca1e7063b0d385 (diff) | |
| parent | 6056c63eed288736c912c82d6f36aa7dd055f9ca (diff) | |
Merge branch 'master' of https://github.com/basho/rebar
Diffstat (limited to 'inttest')
| -rw-r--r-- | inttest/rgen1/reltool.config | 2 | ||||
| -rw-r--r-- | inttest/tdeps1/tdeps1_rt.erl | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/inttest/rgen1/reltool.config b/inttest/rgen1/reltool.config index c6e31f5..4c4713c 100644 --- a/inttest/rgen1/reltool.config +++ b/inttest/rgen1/reltool.config @@ -1,4 +1,4 @@ -%% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*- +%% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*- %% ex: ts=4 sw=4 et {sys, [ {rel, "rgen1", "0.1", diff --git a/inttest/tdeps1/tdeps1_rt.erl b/inttest/tdeps1/tdeps1_rt.erl index 5eb831d..9072e9c 100644 --- a/inttest/tdeps1/tdeps1_rt.erl +++ b/inttest/tdeps1/tdeps1_rt.erl @@ -23,7 +23,7 @@ files() -> {copy, "c.hrl", "repo/c/include/c.hrl"} ]. -run(Dir) -> +run(_Dir) -> %% Initialize the b/c apps as mercurial repos so that dependencies pull %% properly HgCmd = "/bin/sh -c \"hg init && hg add && hg commit -m 'Initial commit'\"", @@ -33,7 +33,7 @@ run(Dir) -> {ok, _} = retest_sh:run("./rebar get-deps compile", []), - true = filelib:is_file("ebin/a.beam"), + true = filelib:is_regular("ebin/a.beam"), ok. |