Skip to content

Fix #13247: get make check-stage1 working again - #13260

Merged
bors merged 3 commits into
rust-lang:masterfrom
pnkfelix:fsk-fix-13247
Apr 5, 2014
Merged

Fix #13247: get make check-stage1 working again#13260
bors merged 3 commits into
rust-lang:masterfrom
pnkfelix:fsk-fix-13247

Conversation

@pnkfelix

Copy link
Copy Markdown
Contributor

Fix#13247.

r? @alexcrichton (or anyone else, really).

1. Fix a long-standing typo in the makefile: the relevant
CTEST_NAME here is `rpass-full` (with a dash), not
`rpass_full`.
2. The rpass-full tests depend on the complete set of target
libraries. Therefore, the rpass-full tests need to use
the dependencies held in the CSREQ-prefixed variable, not
the TLIBRUSTC_DEFAULT-prefixed variable.
@alexcrichton

Copy link
Copy Markdown
Member

Interesting, it appears that we're trying to run the rpass-full tests on android, which we should definitely not be doing. In fixing the dependencies, now it's trying to build libsyntax for android which is almost certainly not what we want.

The relevant block is here and I think that rpass-full needs the same treatment as crates-exec a little bit below it.

@pnkfelix

Copy link
Copy Markdown
ContributorAuthor

mrr I cannot tell if these android failures are injected by my change, I assume they must be...

I guess I will have to try to figure out how to emulate the android build environment locally to try to reproduce.

@alexcrichton

Copy link
Copy Markdown
Member

It looks like it's still trying to build lib{syntax,rustc} for android (which it shouldn't be doing), so I think the dependencies are still leaking in from somewhere.

@pnkfelix

Copy link
Copy Markdown
ContributorAuthor

life is better when one can test one's patches.

Comment threadmk/tests.mk

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Ah, another bug: when we disable running the tests, we should also drop these build prerequisites.

The problems I was hitting during the bors runs were failing during those attempts to resolve those prerequisites (and thus were masking another latent bug in the rule below: it is missing a close-paren).

First, documented the existing `CTEST_DISABLE_$(TEST_GROUP)` pattern
for conditionally disabling tests based on missing host features.
Added variant of above, `CTEST_DISABLE_NONSELFHOST_$(TEST_GROUP)`,
which is only queried in contexts where the target is not on the
CFG_HOST list (which I interpret as the list of targets that our host
can compatibly emulate; e.g. the example that i686 and x86_64 can in
theory run each others' tests).
Driveby fix: Remove redundant copy of
check-stage$(1)-T-$(2)-H-$(3)-$(4)-exec dependency declaration.
bors added a commit that referenced this pull request Apr 5, 2014
@borsbors closed this Apr 5, 2014
@bors
bors merged commit 4edf7b8 into rust-lang:masterApr 5, 2014
matthiaskrgr pushed a commit to matthiaskrgr/rust that referenced this pull request Oct 11, 2022
flip1995 pushed a commit to flip1995/rust that referenced this pull request Sep 5, 2024
…e_items, r=llogiq
Add new lint: `used_underscore_items`
Closesrust-lang#13260
---
changelog: new [`used_underscore_items`] lint against using items with a single leading underscore
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

make check-stage1 is broken

4 participants

@pnkfelix@alexcrichton@huonw@bors