|
@@ -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.
|