Permalink
Browse files

tmp wip

  • Loading branch information...
1 parent 3f38318 commit a44380224c37c34b6f3e2aa136b066bfae0985ec @ericbmerritt committed May 4, 2012
Showing with 11 additions and 2 deletions.
  1. +9 −0 .travis.yml
  2. +2 −2 Makefile
View
9 .travis.yml
@@ -0,0 +1,9 @@
+language: erlang
+otp_release:
+ - R15B
+ - R14B04
+script: "make test"
+branches:
+ only:
+ - master
+ - next
View
4 Makefile
@@ -15,7 +15,7 @@ PYPATH=$(PYTHONPATH):$(SMOKETEST_DIR)
BEHAVIOURS= src/sin_task.erl src/sin_dep_resolver.erl
.PHONY=all setup build escript cucumber proper eunit dialyzer \
- run debug smoketests testall gh-pages clean install-deb \
+ run debug smoketests test gh-pages clean install-deb \
build-deb publish-ppa update-version
SINFLAGS=-s $(CURDIR) -p sinan -n $(VSN)
@@ -81,7 +81,7 @@ smoketests: main
PYTHONPATH=$(PYPATH) python $$f ; \
done
-testall : cucumber proper eunit smoketests
+test : cucumber proper eunit smoketests
gh-pages:
./do-gh-pages

0 comments on commit a443802

Please sign in to comment.