Skip to content

Commit

Permalink
Fix linkerd2-metrics test compilation (linkerd#98)
Browse files Browse the repository at this point in the history
* Fix linkerd2-metrics test compilation

The `quickcheck` dependency was lost when the subcrate was split out.
This change restores the dependency.

Fixes linkerd/linkerd2#1685

* Run tests for all packages in `make test`
  • Loading branch information
olix0r authored Sep 18, 2018
1 parent a4d4110 commit b4ced35
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 1 deletion.
1 change: 1 addition & 0 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,7 @@ dependencies = [
"hyper 0.12.9 (registry+https://github.com/rust-lang/crates.io-index)",
"indexmap 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"quickcheck 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
]

[[package]]
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ TEST_FLAGS =
ifndef TEST_FLAKEY
TEST_FLAGS = --no-default-features
endif
CARGO_TEST = $(CARGO) test --frozen $(RELEASE) $(TEST_FLAGS)
CARGO_TEST = $(CARGO) test --all --frozen $(RELEASE) $(TEST_FLAGS)

DOCKER = docker
DOCKER_BUILD = docker build
Expand Down
3 changes: 3 additions & 0 deletions lib/metrics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ http = "0.1"
hyper = "0.12.3"
indexmap = "1.0"
log = "0.4"

[dev-dependencies]
quickcheck = { version = "0.6", default-features = false }
3 changes: 3 additions & 0 deletions lib/metrics/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ extern crate http;
extern crate hyper;
#[macro_use]
extern crate log;
#[cfg(test)]
#[macro_use]
extern crate quickcheck;

mod counter;
mod gauge;
Expand Down

0 comments on commit b4ced35

Please sign in to comment.