summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Xu <alex_y_xu@yahoo.ca>2014-02-27 09:39:29 -0500
committerAlex Xu <alex_y_xu@yahoo.ca>2014-02-27 09:39:29 -0500
commit893ca88f5362de0c0df061488eabbb04e2482a14 (patch)
treeeb7f68ea0b7969962b65622ee93cef02a197161c
parente2225060089127e7aba043a4c90c4dbd8c684006 (diff)
downloadhtml5ks-893ca88f5362de0c0df061488eabbb04e2482a14.tar.xz
html5ks-893ca88f5362de0c0df061488eabbb04e2482a14.zip
adjust travis
-rwxr-xr-x.travis.sh1
-rw-r--r--.travis.yml2
2 files changed, 2 insertions, 1 deletions
diff --git a/.travis.sh b/.travis.sh
index e6f91a8..a81efae 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -19,6 +19,7 @@ case "$1" in
mv *.rpyc unrpyc
;;
install)
+ MAKEOPTS="-s ${MAKEOPTS}"
sudo apt-get install -qq libtheora-dev libx264-dev yasm
cd libwebp-0.4.0
diff --git a/.travis.yml b/.travis.yml
index 0b671bf..d584f2a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
language: c
python: "3.3"
node_js: "0.11"
-env: MINIMAL=1 CFLAGS="-O2 -march=native -pipe" CXXFLAGS="-O2 -march=native -pipe" MAKEOPTS="-s -j4"
+env: MINIMAL=1 CFLAGS="-O2 -march=native -pipe" CXXFLAGS="-O2 -march=native -pipe" MAKEOPTS="-j8" FFMPEG="ffmpeg -t 00:00:30"
before_install: ./.travis.sh before_install
install: ./.travis.sh install
script: ./.travis.sh script