diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-10-29 15:59:11 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-10-29 15:59:11 -0400 |
| commit | f6faa7681730f877ede2493a0be6c59c4c9ec9e5 (patch) | |
| tree | 5525406cc3a197d43eca42c49b5d775383063b0e | |
| parent | fda8b5de78f0f436557b2e5c0a87df8450f91e85 (diff) | |
| parent | 709cd447f0b207f969d448bd4fe2d5f2795e678d (diff) | |
| download | tor-f6faa7681730f877ede2493a0be6c59c4c9ec9e5.tar.gz tor-f6faa7681730f877ede2493a0be6c59c4c9ec9e5.zip | |
Merge branch 'maint-0.3.5'
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rw-r--r-- | changes/ticket27913 | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index ec1748e67b..39ed6132cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,6 +51,8 @@ matrix: # - env: HARDENING_OPTIONS="" ## We check asciidoc with distcheck, to make sure we remove doc products - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" + # 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 ## But without hardening (see above) - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" HARDENING_OPTIONS="" @@ -184,6 +186,7 @@ install: - 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 [[ "$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 @@ -195,6 +198,7 @@ install: - if [[ "$RUST_OPTIONS" != "" ]]; then rustup --version; fi - if [[ "$RUST_OPTIONS" != "" ]]; then rustc --version; fi - if [[ "$RUST_OPTIONS" != "" ]]; then cargo --version; fi + - if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; git log -1; popd; fi script: - ./autogen.sh @@ -202,8 +206,9 @@ script: - echo "Configure flags are $CONFIGURE_FLAGS" - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. - - if [[ "$DISTCHECK" == "" ]]; then make check; fi - - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi + - if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi + - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor test-stem; fi + - if [[ "$DISTCHECK" != "" && "$TEST_STEM" == "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi after_failure: ## configure will leave a log file with more details of config failures. diff --git a/changes/ticket27913 b/changes/ticket27913 new file mode 100644 index 0000000000..81ce725932 --- /dev/null +++ b/changes/ticket27913 @@ -0,0 +1,3 @@ + o Testing: + - Add new CI job to Travis configuration that runs stem-based + integration tests. Closes ticket 27913. |