[tor-commits] [tor/master] Merge branch 'chutney_ci_v4_029' into chutney_ci_v4_035

dgoulet at torproject.org dgoulet at torproject.org
Tue Jul 23 13:42:25 UTC 2019


commit 84f2c0affbace6227882a9fd440da74515aa7c12
Merge: b0fa1f4fb 75f9ae902
Author: teor <teor at torproject.org>
Date:   Mon Jul 1 14:31:17 2019 +1000

    Merge branch 'chutney_ci_v4_029' into chutney_ci_v4_035

 .travis.yml        | 19 +++++++++++++++----
 changes/chutney_ci |  3 +++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --cc .travis.yml
index 861b37f08,190f43bd0..8493589f7
--- a/.travis.yml
+++ b/.travis.yml
@@@ -45,19 -36,13 +45,22 @@@ matrix
      - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS=""
      ## We only want to check these build option combinations once
      ## (they shouldn't vary by compiler or OS)
 -    ## We run coverage with hardening off, which seems like enough
 +    ## We run rust and coverage with hardening off, which seems like enough
      # - env: HARDENING_OPTIONS=""
      ## We check asciidoc with distcheck, to make sure we remove doc products
-     - env: DISTCHECK="yes" ASCIIDOC_OPTIONS=""
+     - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes"
+     # We also try running a hardened clang build with chutney on Linux.
+     - env: CHUTNEY="yes" SKIP_MAKE_CHECK="yes" CHUTNEY_ALLOW_FAILURES="2"
+       compiler: clang
 +    # We clone our stem repo and run `make test-stem`
 +    - env: TEST_STEM="yes"
 +    ## Check rust online with distcheck, to make sure we remove rust products
 +    - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
 +    ## Check disable module dirauth with and without rust
 +    - env: MODULES_OPTIONS="--disable-module-dirauth" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
 +    - env: MODULES_OPTIONS="--disable-module-dirauth"
 +    ## Check NSS
 +    - env: NSS_OPTIONS="--enable-nss"
  
    ## Uncomment to allow the build to report success (with non-required
    ## sub-builds continuing to run) if all required sub-builds have
@@@ -166,39 -145,25 +169,46 @@@ install
    - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi
    ## If we're on OSX, and using asciidoc, configure asciidoc
    - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export XML_CATALOG_FILES="/usr/local/etc/xml/catalog"; fi
 +  ## If we're using Rust, download rustup
 +  - if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh https://sh.rustup.rs; fi
 +  ## Install the nightly channels of rustc and cargo and setup our toolchain environment
 +  - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain nightly; fi
 +  - if [[ "$RUST_OPTIONS" != "" ]]; then source $HOME/.cargo/env; fi
 +  ## If we're testing rust builds in offline-mode, then set up our vendored dependencies
 +  - if [[ "$TOR_RUST_DEPENDENCIES" == "true" ]]; then export TOR_RUST_DEPENDENCIES=$PWD/src/ext/rust/crates; fi
+   ## If we're running chutney, install it.
+   - if [[ "$CHUTNEY" != "" ]]; then git clone --depth 1 https://github.com/torproject/chutney.git ; export CHUTNEY_PATH="$(pwd)/chutney"; fi
 +  - if [[ "$TEST_STEM" != "" ]]; then git clone --depth 1 https://github.com/torproject/stem.git ; export STEM_SOURCE_DIR=`pwd`/stem; fi
 +  ##
    ## Finally, list installed package versions
    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi
    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew list --versions; fi
 +  ## Get some info about rustup, rustc and cargo
 +  - if [[ "$RUST_OPTIONS" != "" ]]; then which rustup; fi
 +  - if [[ "$RUST_OPTIONS" != "" ]]; then which rustc; fi
 +  - if [[ "$RUST_OPTIONS" != "" ]]; then which cargo; fi
 +  - if [[ "$RUST_OPTIONS" != "" ]]; then rustup --version; fi
 +  - if [[ "$RUST_OPTIONS" != "" ]]; then rustc --version; fi
 +  - if [[ "$RUST_OPTIONS" != "" ]]; then cargo --version; fi
+   ## Get python version
+   - python --version
+   ## If we're running chutney, show the chutney commit
+   - if [[ "$CHUTNEY" != "" ]]; then pushd "$CHUTNEY_PATH"; git log -1 ; popd ; fi
 +  - if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; git log -1; popd; fi
  
  script:
 +  # Skip test_rebind on macOS
 +  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export TOR_SKIP_TEST_REBIND=true; fi
    - ./autogen.sh
 -  - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules"
 +  - 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
    ## We run `make check` because that's what https://jenkins.torproject.org does.
-   - if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi
+   - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi
+   - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi
+   - if [[ "$CHUTNEY" != "" ]]; then make test-network-all; fi
 +  ## Diagnostic for bug 29437: kill stem if it hangs for 15 minutes
 +  - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor; timelimit -p -t 540 -s USR1 -T 30 -S ABRT python3 "$STEM_SOURCE_DIR"/run_tests.py --tor src/app/tor --integ --log notice --target RUN_ALL; fi
-   - if [[ "$DISTCHECK" != "" && "$TEST_STEM" == "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi
    ## If this build was one that produced coverage, upload it.
    - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p' || echo "Coverage failed"; fi
  
@@@ -207,11 -172,10 +217,12 @@@ after_failure
    ## But the log is too long for travis' rendered view, so tail it.
    - tail -1000 config.log || echo "tail failed"
    ## `make check` will leave a log file with more details of test failures.
-   - if [[ "$DISTCHECK" == "" ]]; then cat test-suite.log || echo "cat failed"; fi
+   - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then cat test-suite.log || echo "cat failed"; fi
    ## `make distcheck` puts it somewhere different.
    - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi
 +  - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-core || echo "make failed"; fi
+   - if [[ "$CHUTNEY" != "" ]]; then ls test_network_log || echo "ls failed"; cat test_network_log/* || echo "cat failed"; fi
 +  - if [[ "$TEST_STEM" != "" ]]; then cat "$STEM_SOURCE_DIR"/test/data/tor_log || echo "cat failed"; fi
  
  before_cache:
    ## Delete all gcov files.





More information about the tor-commits mailing list