diff options
| author | teor <teor@torproject.org> | 2019-12-03 12:46:58 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-12-03 12:46:58 +1000 |
| commit | 3207a8e5c21de7d49d7e1c854bf6c0dba23d84a1 (patch) | |
| tree | 0aa00ec97b3a7990e08a287b8e3fd09564a63e5b /.travis.yml | |
| parent | eb81704081b92738216f3fadb172f9f55b2b3201 (diff) | |
| parent | 14089a29b54f1bc46ca0ff263abdc152f013051a (diff) | |
| download | tor-3207a8e5c21de7d49d7e1c854bf6c0dba23d84a1.tar.gz tor-3207a8e5c21de7d49d7e1c854bf6c0dba23d84a1.zip | |
Merge branch 'maint-0.4.1' into maint-0.4.2
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 252da6877a..94e5033d7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,12 +41,16 @@ matrix: ## We run basic tests on macOS - compiler: clang os: osx + ## Turn off some newer features, turn on clang's -Wtypedef-redefinition + env: C_DIALECT_OPTIONS="-std=gnu99" ## We check NSS - ## NSS is a fast job, clang is slower on Linux, so we do NSS clang - - env: NSS_OPTIONS="--enable-nss" - compiler: clang + ## Use -std=gnu99 to turn off some newer features, and maybe turn on some + ## extra gcc warnings? + - env: NSS_OPTIONS="--enable-nss" C_DIALECT_OPTIONS="-std=gnu99" ## We run chutney on Linux, because it's faster than chutney on macOS + ## Chutney is a fast job, clang is slower on Linux, so we do Chutney clang - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + compiler: clang ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. @@ -211,8 +215,8 @@ script: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export TOR_SKIP_TEST_REBIND=true; fi - ./autogen.sh - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $NSS_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo "Configure flags are $CONFIGURE_FLAGS" - - ./configure $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\"" + - ./configure $CONFIGURE_FLAGS CC="$CC $C_DIALECT_OPTIONS" ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi |