diff options
| author | David Sterba <dsterba@suse.com> | 2017-08-28 14:28:53 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-09-08 16:15:05 +0200 |
| commit | 4ef5a112c9d2fe9d6f03ac2ea3aa5b1af0f37254 (patch) | |
| tree | 68c62e17c7c1b382c04146ce77e976b24a625990 | |
| parent | ee3725211533ed5592af79f2e6cb4524ed089047 (diff) | |
btrfs-progs: tests: pull and build reiserfs lib inside CI
The functionality needed to support reiserfs in convert has been added
recently and is not yet available in the CI images, so we'll download
and build it there.
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | .travis.yml | 22 | ||||
| -rwxr-xr-x | travis-should-run-test | 24 |
2 files changed, 41 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 15313df4..b5cc7fe3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,8 @@ compiler: - gcc - clang -cache: ccache +cache: + ccache: true git: depth: 2 @@ -60,8 +61,19 @@ addons: branch_pattern: coverity_scan script: + - "mkdir tmp-reiser; + cd tmp-reiser; + wget https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v3.6.27/reiserfsprogs-3.6.27.tar.xz; + tar xf reiserfsprogs-3.6.27.tar.xz; + cd reiserfsprogs-3.6.27; + ./configure --prefix=/usr; + make all; + sudo make install; + cd ../.. + " - "./autogen.sh && ./configure --disable-documentation && make" - - "make TEST_LOG=dump test-cli" - - "make TEST_LOG=dump test-mkfs" - - "make TEST_LOG=dump test-check" - - "make TEST_LOG=dump test-misc" + - "if ./travis-should-run-test; then make TEST_LOG=dump test-cli; fi" + - "if ./travis-should-run-test; then make TEST_LOG=dump test-mkfs; fi" + - "if ./travis-should-run-test; then make TEST_LOG=dump test-check; fi" + - "if ./travis-should-run-test; then make TEST_LOG=dump test-misc; fi" + - "if [ $TRAVIS_BRANCH = release-test ]; then make TEST_LOG=dump test-convert; fi" diff --git a/travis-should-run-test b/travis-should-run-test new file mode 100755 index 00000000..f711615c --- /dev/null +++ b/travis-should-run-test @@ -0,0 +1,24 @@ +#!/bin/sh + +if [ -z "$TRAVIS_BRANCH" ] ; then + # no branch? run anyway + exit 0 +fi + +# no tests +if [ "$TRAVIS_BRANCH" = 'coverity_scan' ]; then + exit 1 +fi + +# quick tests +if [ "$TRAVIS_BRANCH" = 'devel' -o "$TRAVIS_BRANCH" = 'master' ]; then + exit 0 +fi + +# all tests +if [ "$TRAVIS_BRANCH" = 'release-test' ]; then + exit 0 +fi + +# branch not recognized +exit 1 |