diff options
| author | bors <bors@rust-lang.org> | 2014-08-12 09:31:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-08-12 09:31:17 +0000 |
| commit | c7d0b5259d95ab4ef821bdf93a434538c3a84dad (patch) | |
| tree | 8aae7cebb085c5bb5a42e3a9297b7ab227ff4a75 | |
| parent | c1eaafe8ab2114dd10d87a4983e1263c844f782f (diff) | |
| parent | 06d44aaad34a8599e398b5586cdf7d9ab449a7c9 (diff) | |
| download | rust-c7d0b5259d95ab4ef821bdf93a434538c3a84dad.tar.gz rust-c7d0b5259d95ab4ef821bdf93a434538c3a84dad.zip | |
auto merge of #16434 : vadimcn/rust/many-crates-but-no-match, r=alexcrichton
| -rw-r--r-- | src/test/run-make/many-crates-but-no-match/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/run-make/many-crates-but-no-match/Makefile b/src/test/run-make/many-crates-but-no-match/Makefile index 4d80c09c26b..da5fc78f328 100644 --- a/src/test/run-make/many-crates-but-no-match/Makefile +++ b/src/test/run-make/many-crates-but-no-match/Makefile @@ -20,13 +20,13 @@ all: mkdir -p $(A1) $(A2) $(A3) $(RUSTC) --crate-type=rlib crateA1.rs mv $(TMPDIR)/$(call RLIB_GLOB,crateA) $(A1) - $(RUSTC) --crate-type=rlib -L$(A1) crateB.rs + $(RUSTC) --crate-type=rlib -L $(A1) crateB.rs $(RUSTC) --crate-type=rlib crateA2.rs mv $(TMPDIR)/$(call RLIB_GLOB,crateA) $(A2) $(RUSTC) --crate-type=rlib crateA3.rs mv $(TMPDIR)/$(call RLIB_GLOB,crateA) $(A3) # Ensure crateC fails to compile since A1 is "missing" and A2/A3 hashes do not match - $(RUSTC) -L$(A2) -L$(A3) crateC.rs >$(LOG) 2>&1 || true + $(RUSTC) -L $(A2) -L $(A3) crateC.rs >$(LOG) 2>&1 || true grep "error: found possibly newer version of crate \`crateA\` which \`crateB\` depends on" $(LOG) grep "note: perhaps this crate needs to be recompiled?" $(LOG) grep "note: crate \`crateA\` path #1:" $(LOG) |