summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2014-02-01 14:57:23 -0800
committerBen Longbons <b.r.longbons@gmail.com>2014-02-01 14:57:23 -0800
commit7c77cbd24c03aceff65feae5082221b62eaeea6e (patch)
treefc92065d844ba74c6ef38d0da1f9868aa17e6f79 /.travis.yml
parent3d8b6671b394ef6c4c5df3065a6123a5d6cacb93 (diff)
downloadtmwa-7c77cbd24c03aceff65feae5082221b62eaeea6e.tar.gz
tmwa-7c77cbd24c03aceff65feae5082221b62eaeea6e.tar.bz2
tmwa-7c77cbd24c03aceff65feae5082221b62eaeea6e.tar.xz
tmwa-7c77cbd24c03aceff65feae5082221b62eaeea6e.zip
Get rid of makefile indirection
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 963b088..f2588ed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,13 +47,13 @@ script:
- mkdir build
- cd build
- ../configure --dev CPPFLAGS=-DQUIET
- - make -k -j2
- - make format
+ - make -R -k -j2
+ - make -R format
- git diff --exit-code
## Do something after the main test script
after_script:
- - make test TESTER='valgrind --error-exitcode=1 --track-fds=yes'
+ - make -R test TESTER='valgrind --error-exitcode=1 --track-fds=yes'
### The rest of the file creates a build matrix
### containing gcc-4.6 through gcc-4.8 and clang-3.1 through clang-3.3