Permalink
Browse files

Refactor ci support

  • Loading branch information...
1 parent c64c809 commit 35ef3631b4aa1850a10993c683b9f6253e089c3d @tuncer tuncer committed Jun 29, 2012
Showing with 37 additions and 4 deletions.
  1. +1 −1 .travis.yml
  2. +16 −3 Makefile
  3. +20 −0 rebar.config.script
View
@@ -6,4 +6,4 @@ otp_release:
- R15B
- R14B04
- R14B03
-before_script: "./bootstrap"
+script: "make all deps test"
View
@@ -1,4 +1,9 @@
-.PHONY: dialyzer_warnings xref_warnings
+.PHONY: dialyzer_warnings xref_warnings deps test
+
+REBAR=$(PWD)/rebar
+RETEST=$(PWD)/deps/retest/retest
+EUNIT_DIR=$(PWD)/.eunit
+RETEST_DIR=$(PWD)/.rt.work
all:
./bootstrap
@@ -9,7 +14,7 @@ clean:
debug:
@./bootstrap debug
-check: debug xref dialyzer
+check: debug xref dialyzer deps test
xref:
@./rebar xref
@@ -24,4 +29,12 @@ dialyzer_warnings:
binary: VSN = $(shell ./rebar -V)
binary: clean all
cp rebar ../rebar.wiki/rebar
- (cd ../rebar.wiki && git commit -m "Update $(VSN)" 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) inttest
View
@@ -0,0 +1,20 @@
+%% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 ft=erlang et
+
+%% TODO: Change temporary retest fork back to dizzyd/retest after merge
+%% ExtraDeps = [{retest, ".*", {git, "git://github.com/dizzyd/retest.git"}}],
+ExtraDeps = [{retest, ".*",
+ {git, "git://github.com/tuncer/retest.git", "next"}}],
+
+case os:getenv("REBAR_EXTRA_DEPS") of
+ false ->
+ CONFIG;
+ _ ->
+ case lists:keysearch(deps, 1, CONFIG) of
+ {value, {deps, Deps}} ->
+ NDeps = Deps ++ ExtraDeps,
+ lists:keyreplace(deps, 1, CONFIG, {deps, NDeps});
+ false ->
+ CONFIG ++ [{deps, ExtraDeps}]
+ end
+end.

0 comments on commit 35ef363

Please sign in to comment.