diff options
| author | Guy Harris <guy@alum.mit.edu> | 2020-04-18 20:08:06 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2020-04-18 20:08:06 -0700 |
| commit | 5a21b240867cead83e101c7359d0cd40900c2e5e (patch) | |
| tree | 04ed5881cc725bffc61530ada04ad372fed22fe9 /.travis.yml | |
| parent | cb33bfcc520a5113a796abd3f5828c9fcdb4e2d8 (diff) | |
| download | tcpdump-5a21b240867cead83e101c7359d0cd40900c2e5e.tar.gz | |
Get rid of redundant builds.
If we're building tcpdump with the system libpcap, rather than building
libpcap from source and building tcpdump with that libpcap, we don't
need to distinguish between "remote capture support enabled" and "remote
capture support disabled", as that applies only to libpcap.
Add a comment about the instruction sets and add one indicating why we
exclude jobs with macOS on anything other than 64-bit x86.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index dbf6e016..8051624e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,12 @@ language: c +# +# Try building on these 4 architectures; all are 64-bit, and all but +# "s390x", a/k/a z/Architecture, are little-endian. The crypto library +# on Litle-endian PowerPC/Power ISA does some things that require more +# careful adherence to the documentation, so it's useful for testing +# that. +# arch: - amd64 - ppc64le @@ -16,6 +23,12 @@ compiler: - gcc - clang +# +# Linux runs on all of the architectures listed above; macOS currently +# runs only on 64-bit x86, although the Spaceshipologists are all in a +# tizzy about the possibility of Arm-based Macs. Suppress the macOS +# builds that don't work. +# jobs: exclude: - arch: ppc64le @@ -42,14 +55,11 @@ env: matrix: # NOTE: REMOTE= is for the libpcap build, which is done with autotools # even if we're building tcpdump with CMake. - - BUILD_LIBPCAP=no CMAKE=no REMOTE=disable CRYPTO=no - - BUILD_LIBPCAP=no CMAKE=no REMOTE=disable CRYPTO=yes - - BUILD_LIBPCAP=no CMAKE=no REMOTE=enable CRYPTO=no - - BUILD_LIBPCAP=no CMAKE=no REMOTE=enable CRYPTO=yes - - BUILD_LIBPCAP=no CMAKE=yes REMOTE=disable CRYPTO=no - - BUILD_LIBPCAP=no CMAKE=yes REMOTE=disable CRYPTO=yes - - BUILD_LIBPCAP=no CMAKE=yes REMOTE=enable CRYPTO=no - - BUILD_LIBPCAP=no CMAKE=yes REMOTE=enable CRYPTO=yes + # It's irrelevant if we're building tcpdump with the system libpcap. + - BUILD_LIBPCAP=no CMAKE=no CRYPTO=no + - BUILD_LIBPCAP=no CMAKE=no CRYPTO=yes + - BUILD_LIBPCAP=no CMAKE=yes CRYPTO=no + - BUILD_LIBPCAP=no CMAKE=yes CRYPTO=yes - BUILD_LIBPCAP=yes CMAKE=no REMOTE=disable CRYPTO=no - BUILD_LIBPCAP=yes CMAKE=no REMOTE=disable CRYPTO=yes - BUILD_LIBPCAP=yes CMAKE=no REMOTE=enable CRYPTO=no |