OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #74153 - ehuss:fix-bootstrap-test-librustc, r=Mark-Simulacrum 

Fix x.py test for librustc crates.

#73352 introduced a bug where `x.py test src/librustc_ast` would fail to actually run the tests. The issue is that `krate` and `all_krates` were changed to return relative paths. This caused the code to do a test of "relative_path ends with absolute path" which is always false.  The solution is to swap that around.

The change to `Crate` isn't necessary, it just simplifies the code and makes it uniform with `CrateLibrustc`.
This commit is contained in:
bors 2020-07-08 20:03:32 +00:00
parent 1d919c9377 7238726399
commit 8aa18cbdc5
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bootstrap/test.rs
View File

@ -1562,7 +1562,7 @@ impl Step for CrateLibrustc {
let compiler = builder.compiler(builder.top_stage, run.host);
for krate in builder.in_tree_crates("rustc-main") {
if run.path.ends_with(&krate.path) {
if krate.path.ends_with(&run.path) {
let test_kind = builder.kind.into();
builder.ensure(CrateLibrustc {
@ -1669,7 +1669,7 @@ impl Step for Crate {
};
for krate in builder.in_tree_crates("test") {
if run.path.ends_with(&krate.local_path(&builder)) {
if krate.path.ends_with(&run.path) {
make(Mode::Std, krate);
}
}

1
src/librustc_errors/json/tests.rs
View File

@ -59,6 +59,7 @@ fn test_positions(code: &str, span: (u32, u32), expected_output: SpanTestData) {
sm,
true,
HumanReadableErrorType::Short(ColorConfig::Never),
None,
false,
);