diff options
| author | teor <teor@torproject.org> | 2019-12-03 12:47:02 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-12-03 12:47:02 +1000 |
| commit | df9a1f313799403b813c5645bf5554ee16233517 (patch) | |
| tree | c41847db7cf27b530f6d7f0b7bf833fd6fb2f4b0 | |
| parent | 189287e7bc3c4cb5080c4b6c177121c6e69569f3 (diff) | |
| parent | 3207a8e5c21de7d49d7e1c854bf6c0dba23d84a1 (diff) | |
| download | tor-df9a1f313799403b813c5645bf5554ee16233517.tar.gz tor-df9a1f313799403b813c5645bf5554ee16233517.zip | |
Merge branch 'maint-0.4.2' into release-0.4.2
| -rw-r--r-- | .travis.yml | 14 | ||||
| -rw-r--r-- | changes/ticket32500 | 5 |
2 files changed, 14 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 diff --git a/changes/ticket32500 b/changes/ticket32500 new file mode 100644 index 0000000000..2c0f35df72 --- /dev/null +++ b/changes/ticket32500 @@ -0,0 +1,5 @@ + o Testing: + - Require C99 standards-conforming code in Travis CI, but allow GNU gcc + extensions. Also activates clang's -Wtypedef-redefinition warnings. + Build some jobs with -std=gnu99, and some jobs without. + Closes ticket 32500. |