Skip to content

Commit

Permalink
Fix many-crates-but-no-match test. (Issue #16348)
Browse files Browse the repository at this point in the history
  • Loading branch information
vadimcn committed Aug 12, 2014
1 parent 48ee816 commit 06d44aa
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/test/run-make/many-crates-but-no-match/Makefile
Expand Up @@ -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)
Expand Down

5 comments on commit 06d44aa

@bors
Copy link
Contributor

@bors bors commented on 06d44aa Aug 12, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at vadimcn@06d44aa

@bors
Copy link
Contributor

@bors bors commented on 06d44aa Aug 12, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging vadimcn/rust/many-crates-but-no-match = 06d44aa into auto

@bors
Copy link
Contributor

@bors bors commented on 06d44aa Aug 12, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vadimcn/rust/many-crates-but-no-match = 06d44aa merged ok, testing candidate = c7d0b52

@bors
Copy link
Contributor

@bors bors commented on 06d44aa Aug 12, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = c7d0b52

Please sign in to comment.