summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTristan Sloughter <t@crashfast.com>2014-09-17 17:45:54 -0500
committerTristan Sloughter <t@crashfast.com>2014-09-17 17:45:54 -0500
commit07dd54d7fd1a52181925efcc6b4ffc3b94a7127b (patch)
tree14602dc6441fec5cae9c8f98c53f7af63f3cae17 /Makefile
parent5dc2de6468be98480be50848bd9ba563c69a84f2 (diff)
fix travis test
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile19
1 files changed, 7 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index d4321fa..39548b4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
.PHONY: clean dialyzer_warnings xref_warnings deps test
-REBAR=$(PWD)/rebar
+REBAR=$(PWD)/rebar3
RETEST=$(PWD)/deps/retest/retest
all:
./bootstrap/bootstrap
clean:
- @rm -rf rebar ebin/*.beam inttest/rt.work rt.work .eunit
+ @rm -rf rebar3 ebin/*.beam inttest/rt.work rt.work .eunit
@rm -f .rebarinfo
distclean: clean
@@ -20,7 +20,7 @@ debug:
check: debug xref dialyzer deps test
xref:
- @./rebar xref
+ @./rebar3 xref
dialyzer: dialyzer_warnings
@diff -U0 dialyzer_reference dialyzer_warnings
@@ -29,17 +29,12 @@ dialyzer_warnings:
-@dialyzer -q -nn -n ebin -Wunmatched_returns -Werror_handling \
-Wrace_conditions > dialyzer_warnings
-binary: VSN = $(shell ./rebar -V)
+binary: VSN = $(shell ./rebar3 -V)
binary: clean all
- @cp rebar ../rebar.wiki/rebar
+ @cp rebar3 ../rebar.wiki/rebar
(cd ../rebar.wiki && git commit -m "Update $(VSN)" rebar)
-deps:
- @REBAR_EXTRA_DEPS=1 ./rebar get-deps
- @(cd deps/retest && $(REBAR) compile escriptize)
-
test:
- @$(REBAR) eunit
- @$(RETEST) -v inttest
+ ct_run -pa deps/*/ebin -pa ebin -include include -logdir test/logs -dir test
-travis: all deps test
+travis: all test