aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Collet <yann.collet.73@gmail.com>2014-12-13 16:41:05 +0100
committerMohamad Ayyash <mkayyash@google.com>2015-02-23 17:26:23 -0800
commitde80e89fe9eb1f2a63829cb6806c09b67ea590fd (patch)
tree1ae8827a9016893114a8f5a3f887165eaa0e7ebb
parent8c922c52d8aedd8593ed4b4bd0017489d1a6b674 (diff)
downloadandroid_external_lz4-de80e89fe9eb1f2a63829cb6806c09b67ea590fd.tar.gz
android_external_lz4-de80e89fe9eb1f2a63829cb6806c09b67ea590fd.tar.bz2
android_external_lz4-de80e89fe9eb1f2a63829cb6806c09b67ea590fd.zip
fixed travis tests
-rw-r--r--.travis.yml4
-rw-r--r--Makefile3
2 files changed, 5 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 896aa81..9eff075 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,13 @@
language: c
compiler: gcc
-script: sudo make test-travis
+script: make test-travis
before_install:
- sudo apt-get update -qq
- sudo apt-get install -qq gcc-multilib
- sudo apt-get install -qq valgrind
env:
- - LZ4_TRAVIS_CI_ENV=install
+ - LZ4_TRAVIS_CI_ENV=travis-install
- LZ4_TRAVIS_CI_ENV=streaming-examples
- LZ4_TRAVIS_CI_ENV=cmake
- LZ4_TRAVIS_CI_ENV=dist
diff --git a/Makefile b/Makefile
index 1d190fd..c486239 100644
--- a/Makefile
+++ b/Makefile
@@ -98,6 +98,9 @@ uninstall:
@cd $(LZ4DIR); $(MAKE) uninstall
@cd $(PRGDIR); $(MAKE) uninstall
+travis-install:
+ sudo $(MAKE) install
+
dist: clean
@install -dD -m 700 lz4-$(RELEASE)/lib/
@install -dD -m 700 lz4-$(RELEASE)/programs/