Fix root package dependencies (#2899)

This commit is contained in:
Jack May 2019-02-22 14:08:25 -08:00 committed by GitHub
parent 054c12ea0f
commit 71602fe04b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions

2
Cargo.lock generated
View File

@ -1969,12 +1969,14 @@ dependencies = [
"serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-budget-program 0.12.0",
"solana-drone 0.12.0",
"solana-logger 0.12.0",
"solana-metrics 0.12.0",
"solana-netutil 0.12.0",
"solana-runtime 0.12.0",
"solana-sdk 0.12.0",
"solana-vote-program 0.12.0",
"solana-vote-signer 0.12.0",
"sys-info 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",

View File

@ -61,6 +61,8 @@ untrusted = "0.6.2"
[dev-dependencies]
hex-literal = "0.1.3"
matches = "0.1.6"
solana-vote-program = { path = "programs/native/vote", version = "0.12.0" }
solana-budget-program = { path = "programs/native/budget", version = "0.12.0" }
[[bench]]
name = "banking_stage"

View File

@ -71,8 +71,8 @@ else
fi
# Run root package library tests
_ cargo build --all ${V:+--verbose} --features="$ROOT_FEATURES"
_ cargo test --all --lib ${V:+--verbose} --features="$ROOT_FEATURES" -- --nocapture --test-threads=1
_ cargo build ${V:+--verbose} --features="$ROOT_FEATURES"
_ cargo test --lib ${V:+--verbose} --features="$ROOT_FEATURES" -- --nocapture --test-threads=1
# Run root package integration tests
for test in tests/*.rs; do
@ -80,7 +80,7 @@ for test in tests/*.rs; do
test=${test%.rs} # basename x .rs
(
export RUST_LOG="$test"=trace,$RUST_LOG
_ cargo test --all ${V:+--verbose} --features="$ROOT_FEATURES" --test="$test" \
_ cargo test ${V:+--verbose} --features="$ROOT_FEATURES" --test="$test" \
-- --test-threads=1 --nocapture
)
done