summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml3
-rw-r--r--Makefile19
-rwxr-xr-xbootstrap/bootstrap2
3 files changed, 11 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml
index 88741ea..f0b959e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,3 +5,6 @@ otp_release:
- R15B01
- 17.0
script: "make travis"
+branches:
+ only:
+ - rebar3 \ No newline at end of file
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
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap
index 1a1afcd..032a08e 100755
--- a/bootstrap/bootstrap
+++ b/bootstrap/bootstrap
@@ -88,7 +88,7 @@ main(Args) ->
%% or write out script files on win32.
case os:type() of
{unix,_} ->
- [] = os:cmd("chmod u+x rebar"),
+ [] = os:cmd("chmod u+x rebar3"),
ok;
{win32,_} ->
write_windows_scripts(),