aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2017-08-14 08:29:40 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2017-08-14 08:29:40 -0400
commit0015315c4842bd7e5bc8b69418fa1758c13d78a0 (patch)
treef8631342423603733983232ba8ec12ad6f0383d0
parentMerge branch 'master' of https://github.com/netblue30/firejail (diff)
downloadfirejail-0015315c4842bd7e5bc8b69418fa1758c13d78a0.tar.gz
firejail-0015315c4842bd7e5bc8b69418fa1758c13d78a0.tar.zst
firejail-0015315c4842bd7e5bc8b69418fa1758c13d78a0.zip
travis test
-rw-r--r--.travis.yml4
-rw-r--r--Makefile.in3
2 files changed, 5 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 454a8ad4e..da1bf32e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,8 @@ dist: trusty
3sudo: true 3sudo: true
4 4
5script: 5script:
6 - sudo apt-get -y install expect 6 - sudo apt-get -y install expect csh zsh
7 - ( cd firejail ; ./configure --prefix=/usr && make && sudo make install && make test ) 7 - ( cd firejail ; ./configure --prefix=/usr && make && sudo make install && make test-travis )
8 - ( cd firejail ; sudo make install-strip DESTDIR=$(readlink -f appdir) ) 8 - ( cd firejail ; sudo make install-strip DESTDIR=$(readlink -f appdir) )
9 - ( cd appdir/ ; tar cfvj ../firejail-build$TRAVIS_BUILD_NUMBER.tar.bz2 . ) 9 - ( cd appdir/ ; tar cfvj ../firejail-build$TRAVIS_BUILD_NUMBER.tar.bz2 . )
10 - curl --upload-file ./firejail-*.tar.bz2 https://transfer.sh/firejail-build$TRAVIS_BUILD_NUMBER.tar.bz2 10 - curl --upload-file ./firejail-*.tar.bz2 https://transfer.sh/firejail-build$TRAVIS_BUILD_NUMBER.tar.bz2
diff --git a/Makefile.in b/Makefile.in
index d9d7bcd37..af30d860e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -270,6 +270,9 @@ test-fcopy:
270test: test-profiles test-fcopy test-fs test-utils test-environment test-apps test-apps-x11 test-apps-x11-xorg test-filters test-arguments 270test: test-profiles test-fcopy test-fs test-utils test-environment test-apps test-apps-x11 test-apps-x11-xorg test-filters test-arguments
271 echo "TEST COMPLETE" 271 echo "TEST COMPLETE"
272 272
273test-travis: test-profiles test-fcopy test-fs test-utils test-environment test-filters test-arguments
274 echo "TEST COMPLETE"
275
273########################################## 276##########################################
274# Individual tests, some of them require root access 277# Individual tests, some of them require root access
275# The tests are very intrussive, by the time you are done 278# The tests are very intrussive, by the time you are done