This commit is contained in:
David 2021-05-12 21:47:29 +02:00 committed by Raphael Megzari
parent ec749d81e5
commit 9f4878daca
3 changed files with 30 additions and 14 deletions

View file

@ -0,0 +1,29 @@
diff --git a/rebar.config b/rebar.config
index 1d5a68e..a86ee39 100644
--- a/rebar.config
+++ b/rebar.config
@@ -2,20 +2,20 @@
{erl_opts, [debug_info]}.
-{profiles, [{test, [{deps, [proper]}]}]}.
+%%{profiles, [{test, [{deps, [proper]}]}]}.
{pre_hooks, [{"(linux|darwin|solaris|freebsd|netbsd|openbsd)", ct,
"bin/lfe bin/lfec"
- " -o $REBAR_DEPS_DIR/lfe/test"
+ " -o test"
" test/*_SUITE.lfe"},
{"(linux|darwin|solaris|freebsd|netbsd|openbsd)", eunit,
"bin/lfe bin/lfec"
- " -o $REBAR_DEPS_DIR/lfe/ebin"
+ " -o ebin"
" test/clj-tests.lfe"},
%% TODO: Test this on a win32 box
%% {"win32", ct,
%% "bin/lfe bin/lfec -o $REBAR_DEPS_DIR/lfe/test test/*_SUITE.lfe"}
{"(linux|darwin|solaris|freebsd|netbsd|openbsd)", app_compile,
- "bin/lfe bin/lfec -o $REBAR_DEPS_DIR/lfe/ebin src/*.lfe"}
+ "bin/lfe bin/lfec -o ebin src/*.lfe"}
%% TODO: equivalent win32 hook
]}.

View file

@ -39,7 +39,7 @@ buildRebar3 {
buildInputs = [ erlang makeWrapper ];
beamDeps = [ proper ];
patches = [ ./no-test-deps.patch ./dedup-ebins.patch ] ++ patches;
patches = [ ./fix-rebar-config.patch ./dedup-ebins.patch ] ++ patches;
doCheck = true;
checkTarget = "travis";

View file

@ -1,13 +0,0 @@
diff --git a/rebar.config b/rebar.config
index 1d5a68e..ca33be7 100644
--- a/rebar.config
+++ b/rebar.config
@@ -2,7 +2,7 @@
{erl_opts, [debug_info]}.
-{profiles, [{test, [{deps, [proper]}]}]}.
+%% {profiles, [{test, [{deps, [proper]}]}]}.
{pre_hooks, [{"(linux|darwin|solaris|freebsd|netbsd|openbsd)", ct,
"bin/lfe bin/lfec"