diff options
author | iphydf <iphydf@users.noreply.github.com> | 2016-08-11 13:49:49 +0100 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2016-08-12 20:49:50 +0200 |
commit | 35932b5381886f1d650d2cf853384273d080b821 (patch) | |
tree | 56f36bb7f57f1271a41405a361125f1b5e06dabc /other/travis/autotools-script | |
parent | 11de2c222f31f9df85bcee99c5552a21a2b4895c (diff) |
Add "make install" step to Travis build.
Diffstat (limited to 'other/travis/autotools-script')
-rwxr-xr-x | other/travis/autotools-script | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/other/travis/autotools-script b/other/travis/autotools-script index 284a52d4..735229fb 100755 --- a/other/travis/autotools-script +++ b/other/travis/autotools-script | |||
@@ -1,20 +1,27 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | set -e -x | 3 | set -e -u -x |
4 | . other/travis/env-$ENV.sh | ||
4 | 5 | ||
5 | # Build toxcore and run tests. | 6 | # Build toxcore and run tests. |
6 | ./autogen.sh | 7 | ./autogen.sh |
7 | ./configure \ | 8 | RUN ./configure \ |
8 | --with-libsodium-libs=$CACHE_DIR/lib \ | 9 | --with-libsodium-libs=$CACHE_DIR/lib \ |
9 | --with-libsodium-headers=$CACHE_DIR/include \ | 10 | --with-libsodium-headers=$CACHE_DIR/include \ |
10 | --enable-daemon \ | 11 | --enable-daemon \ |
11 | --enable-logging \ | 12 | --enable-logging \ |
12 | --enable-ntox | 13 | --enable-ntox |
13 | 14 | ||
14 | make -j `nproc` | 15 | # We use make instead of RUN $MAKE here, because the autotools build will only |
16 | # ever run natively on the Linux container, never on a Windows cross compilation | ||
17 | # docker instance or an OSX machine. | ||
18 | make -j`nproc` | ||
19 | |||
15 | # This doesn't currently work on Travis, because the autotools build is broken. | 20 | # This doesn't currently work on Travis, because the autotools build is broken. |
16 | # It does not look up libsodium by pkg-config, so without the --with flags it | 21 | # It does not look up libsodium by pkg-config, so without the --with flags it |
17 | # won't find it. We don't care that much about distcheck at this point, but we | 22 | # won't find it. We don't care that much about distcheck at this point, but we |
18 | # do care whether it configures/builds at all, which is exercised by the make | 23 | # do care whether it configures/builds at all, which is exercised by the make |
19 | # call above. Tests are executed by the cmake build. | 24 | # call above. Tests are executed by the cmake build. |
20 | make distcheck -j `nproc` || true | 25 | echo "*** make distcheck currently fails; see https://github.com/TokTok/toxcore/blob/master/other/travis/autotools-script#L16 ***" |
26 | make distcheck -j`nproc` \ | ||
27 | || echo "*** make distcheck has failed as expected; don't be alarmed ***" | ||