forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(ci): re-enable running of tests in CI

Browse Source
This commit is contained in:
Sean McArthur
2019-08-30 16:49:45 -07:00
parent 946275dd1f
commit 347a10eb05
2 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.travis.yml
View File

@@ -6,13 +6,12 @@ matrix:
include: include:
- rust: nightly - rust: nightly
env: FEATURES="--no-default-features --features runtime,nightly" env: FEATURES="--no-default-features --features runtime,nightly"
# Dependencies may be using the unstable `async_await` feature for now...
#- rust: beta #- rust: beta
# env: FEATURES="--no-default-features --features runtime,__internal_happy_eyeballs_tests" # env: FEATURES="--no-default-features --features runtime,__internal_happy_eyeballs_tests"
#- rust: stable #- rust: stable
# env: FEATURES="--no-default-features --features runtime,__internal_happy_eyeballs_tests" # env: FEATURES="--no-default-features --features runtime,__internal_happy_eyeballs_tests"
#- rust: stable - rust: nightly #stable
# env: FEATURES="--no-default-features" env: FEATURES="--no-default-features"
# Minimum Supported Rust Version # Minimum Supported Rust Version
#- rust: 1.36.0 #- rust: 1.36.0
# env: FEATURES="--no-default-features --features runtime" BUILD_ONLY="1" # env: FEATURES="--no-default-features --features runtime" BUILD_ONLY="1"
@@ -25,10 +24,8 @@ matrix:
# fi # fi
script: script:
- cargo build $FEATURES --all-targets - 'if [ "$BUILD_ONLY" != "1" ]; then cargo test $FEATURES -- --test-threads=1; fi'
# Disable tests temporarily - 'if [ $TRAVIS_RUST_VERSION = nightly ]; then cargo test --benches $FEATURES; fi'
# - 'if [ "$BUILD_ONLY" != "1" ]; then cargo test $FEATURES -- --test-threads=1; fi'
# - 'if [ $TRAVIS_RUST_VERSION = nightly ]; then for f in ./benches/*.rs; do cargo test --bench $(basename $f .rs) $FEATURES; done; fi'
env: env:
global: global:

47
Cargo.toml
View File

@@ -54,8 +54,9 @@ spmc = "0.3"
serde = "1.0" serde = "1.0"
serde_derive = "1.0" serde_derive = "1.0"
serde_json = "1.0" serde_json = "1.0"
tokio-fs = "0.2.0-alpha.3" tokio = "=0.2.0-alpha.4" # using #[tokio::test] attributes
tokio-test = "0.2.0-alpha.3" tokio-fs = "=0.2.0-alpha.4"
tokio-test = "=0.2.0-alpha.4"
url = "1.0" url = "1.0"
@@ -132,6 +133,16 @@ name = "state"
path = "examples/state.rs" path = "examples/state.rs"
required-features = ["runtime"] required-features = ["runtime"]
[[example]]
name = "tower_client"
path = "examples/tower_client.rs"
required-features = ["runtime"]
[[example]]
name = "tower_server"
path = "examples/tower_server.rs"
required-features = ["runtime"]
[[example]] [[example]]
name = "upgrades" name = "upgrades"
path = "examples/upgrades.rs" path = "examples/upgrades.rs"
@@ -144,10 +155,10 @@ path = "examples/web_api.rs"
required-features = ["runtime"] required-features = ["runtime"]
#[[bench]] [[bench]]
#name = "end_to_end" name = "end_to_end"
#path = "benches/end_to_end.rs" path = "benches/end_to_end.rs"
#required-features = ["runtime"] required-features = ["runtime"]
[[bench]] [[bench]]
name = "pipeline" name = "pipeline"
@@ -160,17 +171,17 @@ path = "benches/server.rs"
required-features = ["runtime"] required-features = ["runtime"]
#[[test]] [[test]]
#name = "client" name = "client"
#path = "tests/client.rs" path = "tests/client.rs"
#required-features = ["runtime"] required-features = ["runtime"]
#[[test]] [[test]]
#name = "integration" name = "integration"
#path = "tests/integration.rs" path = "tests/integration.rs"
#required-features = ["runtime"] required-features = ["runtime"]
#[[test]] [[test]]
#name = "server" name = "server"
#path = "tests/server.rs" path = "tests/server.rs"
#required-features = ["runtime"] required-features = ["runtime"]