2022-04-16 03:32:18 +00:00
|
|
|
use std::any::{type_name, Any};
|
2018-03-16 19:10:47 +00:00
|
|
|
use std::cell::{Cell, RefCell};
|
2017-09-15 16:40:35 +00:00
|
|
|
use std::collections::BTreeSet;
|
|
|
|
use std::env;
|
2022-05-03 04:38:25 +00:00
|
|
|
use std::ffi::{OsStr, OsString};
|
2022-04-13 04:56:47 +00:00
|
|
|
use std::fmt::{Debug, Write};
|
2022-05-03 04:38:25 +00:00
|
|
|
use std::fs::{self, File};
|
2017-07-14 00:48:44 +00:00
|
|
|
use std::hash::Hash;
|
2022-05-03 04:38:25 +00:00
|
|
|
use std::io::{BufRead, BufReader, ErrorKind};
|
2017-09-15 16:40:35 +00:00
|
|
|
use std::ops::Deref;
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
use std::path::{Component, Path, PathBuf};
|
2022-05-03 04:38:25 +00:00
|
|
|
use std::process::{Command, Stdio};
|
2018-05-30 17:33:43 +00:00
|
|
|
use std::time::{Duration, Instant};
|
2017-07-05 16:20:20 +00:00
|
|
|
|
2018-12-07 12:21:05 +00:00
|
|
|
use crate::cache::{Cache, Interned, INTERNER};
|
2022-02-14 03:39:32 +00:00
|
|
|
use crate::config::{SplitDebuginfo, TargetSelection};
|
2018-12-07 12:21:05 +00:00
|
|
|
use crate::dist;
|
|
|
|
use crate::doc;
|
2020-11-12 21:23:35 +00:00
|
|
|
use crate::flags::{Color, Subcommand};
|
2018-12-07 12:21:05 +00:00
|
|
|
use crate::install;
|
|
|
|
use crate::native;
|
2019-11-26 11:06:30 +00:00
|
|
|
use crate::run;
|
2018-12-07 12:21:05 +00:00
|
|
|
use crate::test;
|
2020-06-12 22:44:56 +00:00
|
|
|
use crate::tool::{self, SourceType};
|
2022-03-03 17:15:01 +00:00
|
|
|
use crate::util::{self, add_dylib_path, add_link_lib_path, exe, libdir, output, t};
|
2022-02-23 17:27:36 +00:00
|
|
|
use crate::EXTRA_CHECK_CFGS;
|
2022-03-21 13:59:34 +00:00
|
|
|
use crate::{check, Config};
|
2022-06-27 02:07:27 +00:00
|
|
|
use crate::{compile, Crate};
|
2022-03-01 00:40:08 +00:00
|
|
|
use crate::{Build, CLang, DocTests, GitRepo, Mode};
|
2018-12-07 12:21:05 +00:00
|
|
|
|
|
|
|
pub use crate::Compiler;
|
2021-06-08 21:09:56 +00:00
|
|
|
// FIXME: replace with std::lazy after it gets stabilized and reaches beta
|
2022-05-03 04:38:25 +00:00
|
|
|
use once_cell::sync::{Lazy, OnceCell};
|
|
|
|
use xz2::bufread::XzDecoder;
|
2017-07-05 16:46:41 +00:00
|
|
|
|
2017-07-05 16:20:20 +00:00
|
|
|
pub struct Builder<'a> {
|
|
|
|
pub build: &'a Build,
|
|
|
|
pub top_stage: u32,
|
|
|
|
pub kind: Kind,
|
|
|
|
cache: Cache,
|
2018-07-10 16:10:05 +00:00
|
|
|
stack: RefCell<Vec<Box<dyn Any>>>,
|
2018-03-16 19:10:47 +00:00
|
|
|
time_spent_on_dependencies: Cell<Duration>,
|
2018-03-10 02:05:06 +00:00
|
|
|
pub paths: Vec<PathBuf>,
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> Deref for Builder<'a> {
|
|
|
|
type Target = Build;
|
|
|
|
|
|
|
|
fn deref(&self) -> &Self::Target {
|
|
|
|
self.build
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-14 00:48:44 +00:00
|
|
|
pub trait Step: 'static + Clone + Debug + PartialEq + Eq + Hash {
|
2017-07-07 17:17:37 +00:00
|
|
|
/// `PathBuf` when directories are created or to return a `Compiler` once
|
|
|
|
/// it's been assembled.
|
2017-07-14 00:48:44 +00:00
|
|
|
type Output: Clone;
|
2017-07-13 17:12:57 +00:00
|
|
|
|
2020-06-11 07:25:06 +00:00
|
|
|
/// Whether this step is run by default as part of its respective phase.
|
|
|
|
/// `true` here can still be overwritten by `should_run` calling `default_condition`.
|
2017-07-05 16:20:20 +00:00
|
|
|
const DEFAULT: bool = false;
|
|
|
|
|
2019-06-07 14:38:29 +00:00
|
|
|
/// If true, then this rule should be skipped if --target was specified, but --host was not
|
2017-07-05 16:20:20 +00:00
|
|
|
const ONLY_HOSTS: bool = false;
|
|
|
|
|
2019-02-08 13:53:55 +00:00
|
|
|
/// Primary function to execute this rule. Can call `builder.ensure()`
|
2017-07-07 17:17:37 +00:00
|
|
|
/// with other steps to run those.
|
2019-02-25 10:30:32 +00:00
|
|
|
fn run(self, builder: &Builder<'_>) -> Self::Output;
|
2017-07-05 16:20:20 +00:00
|
|
|
|
2017-07-07 17:17:37 +00:00
|
|
|
/// When bootstrap is passed a set of paths, this controls whether this rule
|
|
|
|
/// will execute. However, it does not get called in a "default" context
|
2019-02-08 13:53:55 +00:00
|
|
|
/// when we are not passed any paths; in that case, `make_run` is called
|
2017-07-07 17:17:37 +00:00
|
|
|
/// directly.
|
2019-02-25 10:30:32 +00:00
|
|
|
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_>;
|
2017-07-05 16:20:20 +00:00
|
|
|
|
2019-02-08 13:53:55 +00:00
|
|
|
/// Builds up a "root" rule, either as a default rule or from a path passed
|
2017-07-07 17:17:37 +00:00
|
|
|
/// to us.
|
|
|
|
///
|
|
|
|
/// When path is `None`, we are executing in a context where no paths were
|
|
|
|
/// passed. When `./x.py build` is run, for example, this rule could get
|
|
|
|
/// called if it is in the correct list below with a path of `None`.
|
2019-02-25 10:30:32 +00:00
|
|
|
fn make_run(_run: RunConfig<'_>) {
|
2017-07-14 12:30:16 +00:00
|
|
|
// It is reasonable to not have an implementation of make_run for rules
|
|
|
|
// who do not want to get called from the root context. This means that
|
|
|
|
// they are likely dependencies (e.g., sysroot creation) or similar, and
|
|
|
|
// as such calling them from ./x.py isn't logical.
|
|
|
|
unimplemented!()
|
|
|
|
}
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
|
|
|
|
2017-07-20 23:51:07 +00:00
|
|
|
pub struct RunConfig<'a> {
|
|
|
|
pub builder: &'a Builder<'a>,
|
2020-07-17 14:08:04 +00:00
|
|
|
pub target: TargetSelection,
|
Pass all paths to `Step::run` at once when using `ShouldRun::krate`
This was surprisingly complicated. The main changes are:
1. Invert the order of iteration in `StepDescription::run`.
Previously, it did something like:
```python
for path in paths:
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_path(path):
step.run(builder, set)
```
That worked ok for individual paths, but didn't allow passing more than one path at a time to `Step::run`
(since `pathset_for_paths` only had one path available to it).
Change it to instead look at the intersection of `paths` and `should_run.paths`:
```python
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_paths(paths):
step.run(builder, set)
```
2. Change `pathset_for_path` to take multiple pathsets.
The goal is to avoid `x test library/alloc` testing *all* library crates, instead of just alloc.
The changes here are similarly subtle, to use the intersection between the paths rather than all
paths in `should_run.paths`. I added a test for the behavior to try and make it more clear.
Note that we use pathsets instead of just paths to allow for sets with multiple aliases (*cough* `all_krates` *cough*).
See the documentation added in the next commit for more detail.
3. Change `StepDescription::run` to explicitly handle 0 paths.
Before this was implicitly handled by the `for` loop, which just didn't excute when there were no paths.
Now it needs a check, to avoid trying to run all steps (this is a problem for steps that use `default_condition`).
4. Change `RunDescription` to have a list of pathsets, rather than a single path.
5. Remove paths as they're matched
This allows checking at the end that no invalid paths are left over.
Note that if two steps matched the same path, this will no longer run both;
but that's a bug anyway.
6. Handle suite paths separately from regular sets.
Running multiple suite paths at once instead of in separate `make_run` invocations is both tricky and not particularly useful.
The respective test Steps already handle this by introspecting the original paths.
Avoid having to deal with it by moving suite handling into a seperate loop than `PathSet::Set` checks.
2022-04-22 03:19:36 +00:00
|
|
|
pub paths: Vec<PathSet>,
|
2017-07-20 23:51:07 +00:00
|
|
|
}
|
|
|
|
|
2020-09-06 16:24:22 +00:00
|
|
|
impl RunConfig<'_> {
|
|
|
|
pub fn build_triple(&self) -> TargetSelection {
|
|
|
|
self.builder.build.build
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-19 12:55:46 +00:00
|
|
|
struct StepDescription {
|
|
|
|
default: bool,
|
|
|
|
only_hosts: bool,
|
2019-02-25 10:30:32 +00:00
|
|
|
should_run: fn(ShouldRun<'_>) -> ShouldRun<'_>,
|
|
|
|
make_run: fn(RunConfig<'_>),
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 16:51:58 +00:00
|
|
|
name: &'static str,
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
kind: Kind,
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 16:51:58 +00:00
|
|
|
}
|
|
|
|
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
#[derive(Clone, PartialOrd, Ord, PartialEq, Eq)]
|
2021-12-15 11:50:06 +00:00
|
|
|
pub struct TaskPath {
|
|
|
|
pub path: PathBuf,
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
pub kind: Option<Kind>,
|
2021-12-15 11:50:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
impl TaskPath {
|
|
|
|
pub fn parse(path: impl Into<PathBuf>) -> TaskPath {
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
let mut kind = None;
|
|
|
|
let mut path = path.into();
|
|
|
|
|
|
|
|
let mut components = path.components();
|
|
|
|
if let Some(Component::Normal(os_str)) = components.next() {
|
|
|
|
if let Some(str) = os_str.to_str() {
|
|
|
|
if let Some((found_kind, found_prefix)) = str.split_once("::") {
|
|
|
|
if found_kind.is_empty() {
|
|
|
|
panic!("empty kind in task path {}", path.display());
|
|
|
|
}
|
2022-04-13 04:56:47 +00:00
|
|
|
kind = Kind::parse(found_kind);
|
|
|
|
assert!(kind.is_some());
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
path = Path::new(found_prefix).join(components.as_path());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
TaskPath { path, kind }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Debug for TaskPath {
|
|
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
|
|
if let Some(kind) = &self.kind {
|
|
|
|
write!(f, "{}::", kind.as_str())?;
|
|
|
|
}
|
|
|
|
write!(f, "{}", self.path.display())
|
2021-12-15 11:50:06 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-15 00:00:34 +00:00
|
|
|
/// Collection of paths used to match a task rule.
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 16:51:58 +00:00
|
|
|
#[derive(Debug, Clone, PartialOrd, Ord, PartialEq, Eq)]
|
2018-04-12 11:49:31 +00:00
|
|
|
pub enum PathSet {
|
Pass all paths to `Step::run` at once when using `ShouldRun::krate`
This was surprisingly complicated. The main changes are:
1. Invert the order of iteration in `StepDescription::run`.
Previously, it did something like:
```python
for path in paths:
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_path(path):
step.run(builder, set)
```
That worked ok for individual paths, but didn't allow passing more than one path at a time to `Step::run`
(since `pathset_for_paths` only had one path available to it).
Change it to instead look at the intersection of `paths` and `should_run.paths`:
```python
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_paths(paths):
step.run(builder, set)
```
2. Change `pathset_for_path` to take multiple pathsets.
The goal is to avoid `x test library/alloc` testing *all* library crates, instead of just alloc.
The changes here are similarly subtle, to use the intersection between the paths rather than all
paths in `should_run.paths`. I added a test for the behavior to try and make it more clear.
Note that we use pathsets instead of just paths to allow for sets with multiple aliases (*cough* `all_krates` *cough*).
See the documentation added in the next commit for more detail.
3. Change `StepDescription::run` to explicitly handle 0 paths.
Before this was implicitly handled by the `for` loop, which just didn't excute when there were no paths.
Now it needs a check, to avoid trying to run all steps (this is a problem for steps that use `default_condition`).
4. Change `RunDescription` to have a list of pathsets, rather than a single path.
5. Remove paths as they're matched
This allows checking at the end that no invalid paths are left over.
Note that if two steps matched the same path, this will no longer run both;
but that's a bug anyway.
6. Handle suite paths separately from regular sets.
Running multiple suite paths at once instead of in separate `make_run` invocations is both tricky and not particularly useful.
The respective test Steps already handle this by introspecting the original paths.
Avoid having to deal with it by moving suite handling into a seperate loop than `PathSet::Set` checks.
2022-04-22 03:19:36 +00:00
|
|
|
/// A collection of individual paths or aliases.
|
2020-06-15 00:00:34 +00:00
|
|
|
///
|
|
|
|
/// These are generally matched as a path suffix. For example, a
|
Pass all paths to `Step::run` at once when using `ShouldRun::krate`
This was surprisingly complicated. The main changes are:
1. Invert the order of iteration in `StepDescription::run`.
Previously, it did something like:
```python
for path in paths:
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_path(path):
step.run(builder, set)
```
That worked ok for individual paths, but didn't allow passing more than one path at a time to `Step::run`
(since `pathset_for_paths` only had one path available to it).
Change it to instead look at the intersection of `paths` and `should_run.paths`:
```python
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_paths(paths):
step.run(builder, set)
```
2. Change `pathset_for_path` to take multiple pathsets.
The goal is to avoid `x test library/alloc` testing *all* library crates, instead of just alloc.
The changes here are similarly subtle, to use the intersection between the paths rather than all
paths in `should_run.paths`. I added a test for the behavior to try and make it more clear.
Note that we use pathsets instead of just paths to allow for sets with multiple aliases (*cough* `all_krates` *cough*).
See the documentation added in the next commit for more detail.
3. Change `StepDescription::run` to explicitly handle 0 paths.
Before this was implicitly handled by the `for` loop, which just didn't excute when there were no paths.
Now it needs a check, to avoid trying to run all steps (this is a problem for steps that use `default_condition`).
4. Change `RunDescription` to have a list of pathsets, rather than a single path.
5. Remove paths as they're matched
This allows checking at the end that no invalid paths are left over.
Note that if two steps matched the same path, this will no longer run both;
but that's a bug anyway.
6. Handle suite paths separately from regular sets.
Running multiple suite paths at once instead of in separate `make_run` invocations is both tricky and not particularly useful.
The respective test Steps already handle this by introspecting the original paths.
Avoid having to deal with it by moving suite handling into a seperate loop than `PathSet::Set` checks.
2022-04-22 03:19:36 +00:00
|
|
|
/// command-line value of `std` will match if `library/std` is in the
|
2020-06-15 00:00:34 +00:00
|
|
|
/// set.
|
Pass all paths to `Step::run` at once when using `ShouldRun::krate`
This was surprisingly complicated. The main changes are:
1. Invert the order of iteration in `StepDescription::run`.
Previously, it did something like:
```python
for path in paths:
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_path(path):
step.run(builder, set)
```
That worked ok for individual paths, but didn't allow passing more than one path at a time to `Step::run`
(since `pathset_for_paths` only had one path available to it).
Change it to instead look at the intersection of `paths` and `should_run.paths`:
```python
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_paths(paths):
step.run(builder, set)
```
2. Change `pathset_for_path` to take multiple pathsets.
The goal is to avoid `x test library/alloc` testing *all* library crates, instead of just alloc.
The changes here are similarly subtle, to use the intersection between the paths rather than all
paths in `should_run.paths`. I added a test for the behavior to try and make it more clear.
Note that we use pathsets instead of just paths to allow for sets with multiple aliases (*cough* `all_krates` *cough*).
See the documentation added in the next commit for more detail.
3. Change `StepDescription::run` to explicitly handle 0 paths.
Before this was implicitly handled by the `for` loop, which just didn't excute when there were no paths.
Now it needs a check, to avoid trying to run all steps (this is a problem for steps that use `default_condition`).
4. Change `RunDescription` to have a list of pathsets, rather than a single path.
5. Remove paths as they're matched
This allows checking at the end that no invalid paths are left over.
Note that if two steps matched the same path, this will no longer run both;
but that's a bug anyway.
6. Handle suite paths separately from regular sets.
Running multiple suite paths at once instead of in separate `make_run` invocations is both tricky and not particularly useful.
The respective test Steps already handle this by introspecting the original paths.
Avoid having to deal with it by moving suite handling into a seperate loop than `PathSet::Set` checks.
2022-04-22 03:19:36 +00:00
|
|
|
///
|
|
|
|
/// NOTE: the paths within a set should always be aliases of one another.
|
|
|
|
/// For example, `src/librustdoc` and `src/tools/rustdoc` should be in the same set,
|
|
|
|
/// but `library/core` and `library/std` generally should not, unless there's no way (for that Step)
|
|
|
|
/// to build them separately.
|
2021-12-15 11:50:06 +00:00
|
|
|
Set(BTreeSet<TaskPath>),
|
2020-06-15 00:00:34 +00:00
|
|
|
/// A "suite" of paths.
|
|
|
|
///
|
|
|
|
/// These can match as a path suffix (like `Set`), or as a prefix. For
|
|
|
|
/// example, a command-line value of `src/test/ui/abi/variadic-ffi.rs`
|
|
|
|
/// will match `src/test/ui`. A command-line value of `ui` would also
|
|
|
|
/// match `src/test/ui`.
|
2021-12-15 11:50:06 +00:00
|
|
|
Suite(TaskPath),
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 16:51:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
impl PathSet {
|
2018-02-14 01:42:26 +00:00
|
|
|
fn empty() -> PathSet {
|
2018-04-12 11:49:31 +00:00
|
|
|
PathSet::Set(BTreeSet::new())
|
2018-02-14 01:42:26 +00:00
|
|
|
}
|
|
|
|
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
fn one<P: Into<PathBuf>>(path: P, kind: Kind) -> PathSet {
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 16:51:58 +00:00
|
|
|
let mut set = BTreeSet::new();
|
2022-03-11 19:38:31 +00:00
|
|
|
set.insert(TaskPath { path: path.into(), kind: Some(kind) });
|
2018-04-12 11:49:31 +00:00
|
|
|
PathSet::Set(set)
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 16:51:58 +00:00
|
|
|
}
|
|
|
|
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
fn has(&self, needle: &Path, module: Option<Kind>) -> bool {
|
Pass all paths to `Step::run` at once when using `ShouldRun::krate`
This was surprisingly complicated. The main changes are:
1. Invert the order of iteration in `StepDescription::run`.
Previously, it did something like:
```python
for path in paths:
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_path(path):
step.run(builder, set)
```
That worked ok for individual paths, but didn't allow passing more than one path at a time to `Step::run`
(since `pathset_for_paths` only had one path available to it).
Change it to instead look at the intersection of `paths` and `should_run.paths`:
```python
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_paths(paths):
step.run(builder, set)
```
2. Change `pathset_for_path` to take multiple pathsets.
The goal is to avoid `x test library/alloc` testing *all* library crates, instead of just alloc.
The changes here are similarly subtle, to use the intersection between the paths rather than all
paths in `should_run.paths`. I added a test for the behavior to try and make it more clear.
Note that we use pathsets instead of just paths to allow for sets with multiple aliases (*cough* `all_krates` *cough*).
See the documentation added in the next commit for more detail.
3. Change `StepDescription::run` to explicitly handle 0 paths.
Before this was implicitly handled by the `for` loop, which just didn't excute when there were no paths.
Now it needs a check, to avoid trying to run all steps (this is a problem for steps that use `default_condition`).
4. Change `RunDescription` to have a list of pathsets, rather than a single path.
5. Remove paths as they're matched
This allows checking at the end that no invalid paths are left over.
Note that if two steps matched the same path, this will no longer run both;
but that's a bug anyway.
6. Handle suite paths separately from regular sets.
Running multiple suite paths at once instead of in separate `make_run` invocations is both tricky and not particularly useful.
The respective test Steps already handle this by introspecting the original paths.
Avoid having to deal with it by moving suite handling into a seperate loop than `PathSet::Set` checks.
2022-04-22 03:19:36 +00:00
|
|
|
match self {
|
|
|
|
PathSet::Set(set) => set.iter().any(|p| Self::check(p, needle, module)),
|
|
|
|
PathSet::Suite(suite) => Self::check(suite, needle, module),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// internal use only
|
|
|
|
fn check(p: &TaskPath, needle: &Path, module: Option<Kind>) -> bool {
|
|
|
|
if let (Some(p_kind), Some(kind)) = (&p.kind, module) {
|
|
|
|
p.path.ends_with(needle) && *p_kind == kind
|
|
|
|
} else {
|
|
|
|
p.path.ends_with(needle)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Return all `TaskPath`s in `Self` that contain any of the `needles`, removing the
|
|
|
|
/// matched needles.
|
|
|
|
///
|
|
|
|
/// This is used for `StepDescription::krate`, which passes all matching crates at once to
|
|
|
|
/// `Step::make_run`, rather than calling it many times with a single crate.
|
|
|
|
/// See `tests.rs` for examples.
|
|
|
|
fn intersection_removing_matches(
|
|
|
|
&self,
|
|
|
|
needles: &mut Vec<&Path>,
|
|
|
|
module: Option<Kind>,
|
|
|
|
) -> PathSet {
|
|
|
|
let mut check = |p| {
|
|
|
|
for (i, n) in needles.iter().enumerate() {
|
|
|
|
let matched = Self::check(p, n, module);
|
|
|
|
if matched {
|
|
|
|
needles.remove(i);
|
|
|
|
return true;
|
|
|
|
}
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
}
|
Pass all paths to `Step::run` at once when using `ShouldRun::krate`
This was surprisingly complicated. The main changes are:
1. Invert the order of iteration in `StepDescription::run`.
Previously, it did something like:
```python
for path in paths:
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_path(path):
step.run(builder, set)
```
That worked ok for individual paths, but didn't allow passing more than one path at a time to `Step::run`
(since `pathset_for_paths` only had one path available to it).
Change it to instead look at the intersection of `paths` and `should_run.paths`:
```python
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_paths(paths):
step.run(builder, set)
```
2. Change `pathset_for_path` to take multiple pathsets.
The goal is to avoid `x test library/alloc` testing *all* library crates, instead of just alloc.
The changes here are similarly subtle, to use the intersection between the paths rather than all
paths in `should_run.paths`. I added a test for the behavior to try and make it more clear.
Note that we use pathsets instead of just paths to allow for sets with multiple aliases (*cough* `all_krates` *cough*).
See the documentation added in the next commit for more detail.
3. Change `StepDescription::run` to explicitly handle 0 paths.
Before this was implicitly handled by the `for` loop, which just didn't excute when there were no paths.
Now it needs a check, to avoid trying to run all steps (this is a problem for steps that use `default_condition`).
4. Change `RunDescription` to have a list of pathsets, rather than a single path.
5. Remove paths as they're matched
This allows checking at the end that no invalid paths are left over.
Note that if two steps matched the same path, this will no longer run both;
but that's a bug anyway.
6. Handle suite paths separately from regular sets.
Running multiple suite paths at once instead of in separate `make_run` invocations is both tricky and not particularly useful.
The respective test Steps already handle this by introspecting the original paths.
Avoid having to deal with it by moving suite handling into a seperate loop than `PathSet::Set` checks.
2022-04-22 03:19:36 +00:00
|
|
|
false
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
};
|
2018-04-12 11:49:31 +00:00
|
|
|
match self {
|
Pass all paths to `Step::run` at once when using `ShouldRun::krate`
This was surprisingly complicated. The main changes are:
1. Invert the order of iteration in `StepDescription::run`.
Previously, it did something like:
```python
for path in paths:
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_path(path):
step.run(builder, set)
```
That worked ok for individual paths, but didn't allow passing more than one path at a time to `Step::run`
(since `pathset_for_paths` only had one path available to it).
Change it to instead look at the intersection of `paths` and `should_run.paths`:
```python
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_paths(paths):
step.run(builder, set)
```
2. Change `pathset_for_path` to take multiple pathsets.
The goal is to avoid `x test library/alloc` testing *all* library crates, instead of just alloc.
The changes here are similarly subtle, to use the intersection between the paths rather than all
paths in `should_run.paths`. I added a test for the behavior to try and make it more clear.
Note that we use pathsets instead of just paths to allow for sets with multiple aliases (*cough* `all_krates` *cough*).
See the documentation added in the next commit for more detail.
3. Change `StepDescription::run` to explicitly handle 0 paths.
Before this was implicitly handled by the `for` loop, which just didn't excute when there were no paths.
Now it needs a check, to avoid trying to run all steps (this is a problem for steps that use `default_condition`).
4. Change `RunDescription` to have a list of pathsets, rather than a single path.
5. Remove paths as they're matched
This allows checking at the end that no invalid paths are left over.
Note that if two steps matched the same path, this will no longer run both;
but that's a bug anyway.
6. Handle suite paths separately from regular sets.
Running multiple suite paths at once instead of in separate `make_run` invocations is both tricky and not particularly useful.
The respective test Steps already handle this by introspecting the original paths.
Avoid having to deal with it by moving suite handling into a seperate loop than `PathSet::Set` checks.
2022-04-22 03:19:36 +00:00
|
|
|
PathSet::Set(set) => PathSet::Set(set.iter().filter(|&p| check(p)).cloned().collect()),
|
|
|
|
PathSet::Suite(suite) => {
|
|
|
|
if check(suite) {
|
|
|
|
self.clone()
|
|
|
|
} else {
|
|
|
|
PathSet::empty()
|
|
|
|
}
|
|
|
|
}
|
2018-04-12 11:49:31 +00:00
|
|
|
}
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 16:51:58 +00:00
|
|
|
}
|
|
|
|
|
Pass all paths to `Step::run` at once when using `ShouldRun::krate`
This was surprisingly complicated. The main changes are:
1. Invert the order of iteration in `StepDescription::run`.
Previously, it did something like:
```python
for path in paths:
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_path(path):
step.run(builder, set)
```
That worked ok for individual paths, but didn't allow passing more than one path at a time to `Step::run`
(since `pathset_for_paths` only had one path available to it).
Change it to instead look at the intersection of `paths` and `should_run.paths`:
```python
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_paths(paths):
step.run(builder, set)
```
2. Change `pathset_for_path` to take multiple pathsets.
The goal is to avoid `x test library/alloc` testing *all* library crates, instead of just alloc.
The changes here are similarly subtle, to use the intersection between the paths rather than all
paths in `should_run.paths`. I added a test for the behavior to try and make it more clear.
Note that we use pathsets instead of just paths to allow for sets with multiple aliases (*cough* `all_krates` *cough*).
See the documentation added in the next commit for more detail.
3. Change `StepDescription::run` to explicitly handle 0 paths.
Before this was implicitly handled by the `for` loop, which just didn't excute when there were no paths.
Now it needs a check, to avoid trying to run all steps (this is a problem for steps that use `default_condition`).
4. Change `RunDescription` to have a list of pathsets, rather than a single path.
5. Remove paths as they're matched
This allows checking at the end that no invalid paths are left over.
Note that if two steps matched the same path, this will no longer run both;
but that's a bug anyway.
6. Handle suite paths separately from regular sets.
Running multiple suite paths at once instead of in separate `make_run` invocations is both tricky and not particularly useful.
The respective test Steps already handle this by introspecting the original paths.
Avoid having to deal with it by moving suite handling into a seperate loop than `PathSet::Set` checks.
2022-04-22 03:19:36 +00:00
|
|
|
/// A convenience wrapper for Steps which know they have no aliases and all their sets contain only a single path.
|
|
|
|
///
|
|
|
|
/// This can be used with [`ShouldRun::krate`], [`ShouldRun::path`], or [`ShouldRun::alias`].
|
|
|
|
#[track_caller]
|
|
|
|
pub fn assert_single_path(&self) -> &TaskPath {
|
2018-04-12 11:49:31 +00:00
|
|
|
match self {
|
2021-12-15 11:50:06 +00:00
|
|
|
PathSet::Set(set) => {
|
Pass all paths to `Step::run` at once when using `ShouldRun::krate`
This was surprisingly complicated. The main changes are:
1. Invert the order of iteration in `StepDescription::run`.
Previously, it did something like:
```python
for path in paths:
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_path(path):
step.run(builder, set)
```
That worked ok for individual paths, but didn't allow passing more than one path at a time to `Step::run`
(since `pathset_for_paths` only had one path available to it).
Change it to instead look at the intersection of `paths` and `should_run.paths`:
```python
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_paths(paths):
step.run(builder, set)
```
2. Change `pathset_for_path` to take multiple pathsets.
The goal is to avoid `x test library/alloc` testing *all* library crates, instead of just alloc.
The changes here are similarly subtle, to use the intersection between the paths rather than all
paths in `should_run.paths`. I added a test for the behavior to try and make it more clear.
Note that we use pathsets instead of just paths to allow for sets with multiple aliases (*cough* `all_krates` *cough*).
See the documentation added in the next commit for more detail.
3. Change `StepDescription::run` to explicitly handle 0 paths.
Before this was implicitly handled by the `for` loop, which just didn't excute when there were no paths.
Now it needs a check, to avoid trying to run all steps (this is a problem for steps that use `default_condition`).
4. Change `RunDescription` to have a list of pathsets, rather than a single path.
5. Remove paths as they're matched
This allows checking at the end that no invalid paths are left over.
Note that if two steps matched the same path, this will no longer run both;
but that's a bug anyway.
6. Handle suite paths separately from regular sets.
Running multiple suite paths at once instead of in separate `make_run` invocations is both tricky and not particularly useful.
The respective test Steps already handle this by introspecting the original paths.
Avoid having to deal with it by moving suite handling into a seperate loop than `PathSet::Set` checks.
2022-04-22 03:19:36 +00:00
|
|
|
assert_eq!(set.len(), 1, "called assert_single_path on multiple paths");
|
|
|
|
set.iter().next().unwrap()
|
2021-12-15 11:50:06 +00:00
|
|
|
}
|
Pass all paths to `Step::run` at once when using `ShouldRun::krate`
This was surprisingly complicated. The main changes are:
1. Invert the order of iteration in `StepDescription::run`.
Previously, it did something like:
```python
for path in paths:
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_path(path):
step.run(builder, set)
```
That worked ok for individual paths, but didn't allow passing more than one path at a time to `Step::run`
(since `pathset_for_paths` only had one path available to it).
Change it to instead look at the intersection of `paths` and `should_run.paths`:
```python
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_paths(paths):
step.run(builder, set)
```
2. Change `pathset_for_path` to take multiple pathsets.
The goal is to avoid `x test library/alloc` testing *all* library crates, instead of just alloc.
The changes here are similarly subtle, to use the intersection between the paths rather than all
paths in `should_run.paths`. I added a test for the behavior to try and make it more clear.
Note that we use pathsets instead of just paths to allow for sets with multiple aliases (*cough* `all_krates` *cough*).
See the documentation added in the next commit for more detail.
3. Change `StepDescription::run` to explicitly handle 0 paths.
Before this was implicitly handled by the `for` loop, which just didn't excute when there were no paths.
Now it needs a check, to avoid trying to run all steps (this is a problem for steps that use `default_condition`).
4. Change `RunDescription` to have a list of pathsets, rather than a single path.
5. Remove paths as they're matched
This allows checking at the end that no invalid paths are left over.
Note that if two steps matched the same path, this will no longer run both;
but that's a bug anyway.
6. Handle suite paths separately from regular sets.
Running multiple suite paths at once instead of in separate `make_run` invocations is both tricky and not particularly useful.
The respective test Steps already handle this by introspecting the original paths.
Avoid having to deal with it by moving suite handling into a seperate loop than `PathSet::Set` checks.
2022-04-22 03:19:36 +00:00
|
|
|
PathSet::Suite(_) => unreachable!("called assert_single_path on a Suite path"),
|
2018-04-12 11:49:31 +00:00
|
|
|
}
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 16:51:58 +00:00
|
|
|
}
|
2017-07-19 12:55:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
impl StepDescription {
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
fn from<S: Step>(kind: Kind) -> StepDescription {
|
2017-07-19 12:55:46 +00:00
|
|
|
StepDescription {
|
|
|
|
default: S::DEFAULT,
|
|
|
|
only_hosts: S::ONLY_HOSTS,
|
|
|
|
should_run: S::should_run,
|
|
|
|
make_run: S::make_run,
|
2019-08-11 16:55:14 +00:00
|
|
|
name: std::any::type_name::<S>(),
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
kind,
|
2017-07-19 12:55:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Pass all paths to `Step::run` at once when using `ShouldRun::krate`
This was surprisingly complicated. The main changes are:
1. Invert the order of iteration in `StepDescription::run`.
Previously, it did something like:
```python
for path in paths:
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_path(path):
step.run(builder, set)
```
That worked ok for individual paths, but didn't allow passing more than one path at a time to `Step::run`
(since `pathset_for_paths` only had one path available to it).
Change it to instead look at the intersection of `paths` and `should_run.paths`:
```python
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_paths(paths):
step.run(builder, set)
```
2. Change `pathset_for_path` to take multiple pathsets.
The goal is to avoid `x test library/alloc` testing *all* library crates, instead of just alloc.
The changes here are similarly subtle, to use the intersection between the paths rather than all
paths in `should_run.paths`. I added a test for the behavior to try and make it more clear.
Note that we use pathsets instead of just paths to allow for sets with multiple aliases (*cough* `all_krates` *cough*).
See the documentation added in the next commit for more detail.
3. Change `StepDescription::run` to explicitly handle 0 paths.
Before this was implicitly handled by the `for` loop, which just didn't excute when there were no paths.
Now it needs a check, to avoid trying to run all steps (this is a problem for steps that use `default_condition`).
4. Change `RunDescription` to have a list of pathsets, rather than a single path.
5. Remove paths as they're matched
This allows checking at the end that no invalid paths are left over.
Note that if two steps matched the same path, this will no longer run both;
but that's a bug anyway.
6. Handle suite paths separately from regular sets.
Running multiple suite paths at once instead of in separate `make_run` invocations is both tricky and not particularly useful.
The respective test Steps already handle this by introspecting the original paths.
Avoid having to deal with it by moving suite handling into a seperate loop than `PathSet::Set` checks.
2022-04-22 03:19:36 +00:00
|
|
|
fn maybe_run(&self, builder: &Builder<'_>, pathsets: Vec<PathSet>) {
|
|
|
|
if pathsets.iter().any(|set| self.is_excluded(builder, set)) {
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 16:51:58 +00:00
|
|
|
return;
|
2018-02-09 20:40:23 +00:00
|
|
|
}
|
2017-07-19 12:55:46 +00:00
|
|
|
|
2017-07-30 04:12:53 +00:00
|
|
|
// Determine the targets participating in this rule.
|
2020-09-25 00:42:20 +00:00
|
|
|
let targets = if self.only_hosts { &builder.hosts } else { &builder.targets };
|
2017-07-19 12:55:46 +00:00
|
|
|
|
2020-09-06 16:24:22 +00:00
|
|
|
for target in targets {
|
Pass all paths to `Step::run` at once when using `ShouldRun::krate`
This was surprisingly complicated. The main changes are:
1. Invert the order of iteration in `StepDescription::run`.
Previously, it did something like:
```python
for path in paths:
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_path(path):
step.run(builder, set)
```
That worked ok for individual paths, but didn't allow passing more than one path at a time to `Step::run`
(since `pathset_for_paths` only had one path available to it).
Change it to instead look at the intersection of `paths` and `should_run.paths`:
```python
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_paths(paths):
step.run(builder, set)
```
2. Change `pathset_for_path` to take multiple pathsets.
The goal is to avoid `x test library/alloc` testing *all* library crates, instead of just alloc.
The changes here are similarly subtle, to use the intersection between the paths rather than all
paths in `should_run.paths`. I added a test for the behavior to try and make it more clear.
Note that we use pathsets instead of just paths to allow for sets with multiple aliases (*cough* `all_krates` *cough*).
See the documentation added in the next commit for more detail.
3. Change `StepDescription::run` to explicitly handle 0 paths.
Before this was implicitly handled by the `for` loop, which just didn't excute when there were no paths.
Now it needs a check, to avoid trying to run all steps (this is a problem for steps that use `default_condition`).
4. Change `RunDescription` to have a list of pathsets, rather than a single path.
5. Remove paths as they're matched
This allows checking at the end that no invalid paths are left over.
Note that if two steps matched the same path, this will no longer run both;
but that's a bug anyway.
6. Handle suite paths separately from regular sets.
Running multiple suite paths at once instead of in separate `make_run` invocations is both tricky and not particularly useful.
The respective test Steps already handle this by introspecting the original paths.
Avoid having to deal with it by moving suite handling into a seperate loop than `PathSet::Set` checks.
2022-04-22 03:19:36 +00:00
|
|
|
let run = RunConfig { builder, paths: pathsets.clone(), target: *target };
|
2020-09-06 16:24:22 +00:00
|
|
|
(self.make_run)(run);
|
2017-07-19 12:55:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-07-23 14:51:43 +00:00
|
|
|
fn is_excluded(&self, builder: &Builder<'_>, pathset: &PathSet) -> bool {
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
if builder.config.exclude.iter().any(|e| pathset.has(&e.path, e.kind)) {
|
2022-05-26 02:01:55 +00:00
|
|
|
println!("Skipping {:?} because it is excluded", pathset);
|
2021-07-23 14:51:43 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if !builder.config.exclude.is_empty() {
|
[bootstrap] Don't print `Suite not skipped` unless `--verbose` is set
This was so verbose before that it made it hard to see what effect the flag actually had.
Before:
```
Set({test::src/tools/tidy}) not skipped for "bootstrap::test::Tidy" -- not in [src/test/ui, src/test/mir-opt/, src/test/debuginfo, src/test/ui-fulldeps]
Skipping Suite(test::src/test/ui) because it is excluded
Suite(test::src/test/run-pass-valgrind) not skipped for "bootstrap::test::RunPassValgrind" -- not in [src/test/ui, src/test/mir-opt/, src/test/debuginfo, src/test/ui-fulldeps]
Skipping Suite(test::src/test/mir-opt) because it is excluded
Suite(test::src/test/codegen) not skipped for "bootstrap::test::Codegen" -- not in [src/test/ui, src/test/mir-opt/, src/test/debuginfo, src/test/ui-fulldeps]
Suite(test::src/test/codegen-units) not skipped for "bootstrap::test::CodegenUnits" -- not in [src/test/ui, src/test/mir-opt/, src/test/debuginfo, src/test/ui-fulldeps]
Suite(test::src/test/assembly) not skipped for "bootstrap::test::Assembly" -- not in [src/test/ui, src/test/mir-opt/, src/test/debuginfo, src/test/ui-fulldeps]
Suite(test::src/test/incremental) not skipped for "bootstrap::test::Incremental" -- not in [src/test/ui, src/test/mir-opt/, src/test/debuginfo, src/test/ui-fulldeps]
Skipping Suite(test::src/test/debuginfo) because it is excluded
Skipping Suite(test::src/test/ui-fulldeps) because it is excluded
... about 100 more lines ...
```
After:
```
Skipping Suite(test::src/test/ui) because it is excluded
Skipping Suite(test::src/test/mir-opt) because it is excluded
Skipping Suite(test::src/test/debuginfo) because it is excluded
Skipping Suite(test::src/test/ui-fulldeps) because it is excluded
```
2022-03-27 15:11:02 +00:00
|
|
|
builder.verbose(&format!(
|
2021-07-23 14:51:43 +00:00
|
|
|
"{:?} not skipped for {:?} -- not in {:?}",
|
|
|
|
pathset, self.name, builder.config.exclude
|
[bootstrap] Don't print `Suite not skipped` unless `--verbose` is set
This was so verbose before that it made it hard to see what effect the flag actually had.
Before:
```
Set({test::src/tools/tidy}) not skipped for "bootstrap::test::Tidy" -- not in [src/test/ui, src/test/mir-opt/, src/test/debuginfo, src/test/ui-fulldeps]
Skipping Suite(test::src/test/ui) because it is excluded
Suite(test::src/test/run-pass-valgrind) not skipped for "bootstrap::test::RunPassValgrind" -- not in [src/test/ui, src/test/mir-opt/, src/test/debuginfo, src/test/ui-fulldeps]
Skipping Suite(test::src/test/mir-opt) because it is excluded
Suite(test::src/test/codegen) not skipped for "bootstrap::test::Codegen" -- not in [src/test/ui, src/test/mir-opt/, src/test/debuginfo, src/test/ui-fulldeps]
Suite(test::src/test/codegen-units) not skipped for "bootstrap::test::CodegenUnits" -- not in [src/test/ui, src/test/mir-opt/, src/test/debuginfo, src/test/ui-fulldeps]
Suite(test::src/test/assembly) not skipped for "bootstrap::test::Assembly" -- not in [src/test/ui, src/test/mir-opt/, src/test/debuginfo, src/test/ui-fulldeps]
Suite(test::src/test/incremental) not skipped for "bootstrap::test::Incremental" -- not in [src/test/ui, src/test/mir-opt/, src/test/debuginfo, src/test/ui-fulldeps]
Skipping Suite(test::src/test/debuginfo) because it is excluded
Skipping Suite(test::src/test/ui-fulldeps) because it is excluded
... about 100 more lines ...
```
After:
```
Skipping Suite(test::src/test/ui) because it is excluded
Skipping Suite(test::src/test/mir-opt) because it is excluded
Skipping Suite(test::src/test/debuginfo) because it is excluded
Skipping Suite(test::src/test/ui-fulldeps) because it is excluded
```
2022-03-27 15:11:02 +00:00
|
|
|
));
|
2021-07-23 14:51:43 +00:00
|
|
|
}
|
|
|
|
false
|
|
|
|
}
|
|
|
|
|
2019-02-25 10:30:32 +00:00
|
|
|
fn run(v: &[StepDescription], builder: &Builder<'_>, paths: &[PathBuf]) {
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
let should_runs = v
|
|
|
|
.iter()
|
|
|
|
.map(|desc| (desc.should_run)(ShouldRun::new(builder, desc.kind)))
|
|
|
|
.collect::<Vec<_>>();
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 16:51:58 +00:00
|
|
|
|
|
|
|
// sanity checks on rules
|
|
|
|
for (desc, should_run) in v.iter().zip(&should_runs) {
|
2018-05-30 17:33:43 +00:00
|
|
|
assert!(
|
|
|
|
!should_run.paths.is_empty(),
|
|
|
|
"{:?} should have at least one pathset",
|
|
|
|
desc.name
|
|
|
|
);
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 16:51:58 +00:00
|
|
|
}
|
|
|
|
|
2020-10-09 17:51:07 +00:00
|
|
|
if paths.is_empty() || builder.config.include_default_paths {
|
|
|
|
for (desc, should_run) in v.iter().zip(&should_runs) {
|
2021-06-08 21:09:56 +00:00
|
|
|
if desc.default && should_run.is_really_default() {
|
2022-06-19 22:25:20 +00:00
|
|
|
desc.maybe_run(builder, should_run.paths.iter().cloned().collect());
|
2017-07-19 12:55:46 +00:00
|
|
|
}
|
|
|
|
}
|
2020-10-09 17:51:07 +00:00
|
|
|
}
|
2017-07-19 12:55:46 +00:00
|
|
|
|
Pass all paths to `Step::run` at once when using `ShouldRun::krate`
This was surprisingly complicated. The main changes are:
1. Invert the order of iteration in `StepDescription::run`.
Previously, it did something like:
```python
for path in paths:
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_path(path):
step.run(builder, set)
```
That worked ok for individual paths, but didn't allow passing more than one path at a time to `Step::run`
(since `pathset_for_paths` only had one path available to it).
Change it to instead look at the intersection of `paths` and `should_run.paths`:
```python
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_paths(paths):
step.run(builder, set)
```
2. Change `pathset_for_path` to take multiple pathsets.
The goal is to avoid `x test library/alloc` testing *all* library crates, instead of just alloc.
The changes here are similarly subtle, to use the intersection between the paths rather than all
paths in `should_run.paths`. I added a test for the behavior to try and make it more clear.
Note that we use pathsets instead of just paths to allow for sets with multiple aliases (*cough* `all_krates` *cough*).
See the documentation added in the next commit for more detail.
3. Change `StepDescription::run` to explicitly handle 0 paths.
Before this was implicitly handled by the `for` loop, which just didn't excute when there were no paths.
Now it needs a check, to avoid trying to run all steps (this is a problem for steps that use `default_condition`).
4. Change `RunDescription` to have a list of pathsets, rather than a single path.
5. Remove paths as they're matched
This allows checking at the end that no invalid paths are left over.
Note that if two steps matched the same path, this will no longer run both;
but that's a bug anyway.
6. Handle suite paths separately from regular sets.
Running multiple suite paths at once instead of in separate `make_run` invocations is both tricky and not particularly useful.
The respective test Steps already handle this by introspecting the original paths.
Avoid having to deal with it by moving suite handling into a seperate loop than `PathSet::Set` checks.
2022-04-22 03:19:36 +00:00
|
|
|
// strip CurDir prefix if present
|
|
|
|
let mut paths: Vec<_> =
|
|
|
|
paths.into_iter().map(|p| p.strip_prefix(".").unwrap_or(p)).collect();
|
2020-10-09 17:51:07 +00:00
|
|
|
|
Pass all paths to `Step::run` at once when using `ShouldRun::krate`
This was surprisingly complicated. The main changes are:
1. Invert the order of iteration in `StepDescription::run`.
Previously, it did something like:
```python
for path in paths:
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_path(path):
step.run(builder, set)
```
That worked ok for individual paths, but didn't allow passing more than one path at a time to `Step::run`
(since `pathset_for_paths` only had one path available to it).
Change it to instead look at the intersection of `paths` and `should_run.paths`:
```python
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_paths(paths):
step.run(builder, set)
```
2. Change `pathset_for_path` to take multiple pathsets.
The goal is to avoid `x test library/alloc` testing *all* library crates, instead of just alloc.
The changes here are similarly subtle, to use the intersection between the paths rather than all
paths in `should_run.paths`. I added a test for the behavior to try and make it more clear.
Note that we use pathsets instead of just paths to allow for sets with multiple aliases (*cough* `all_krates` *cough*).
See the documentation added in the next commit for more detail.
3. Change `StepDescription::run` to explicitly handle 0 paths.
Before this was implicitly handled by the `for` loop, which just didn't excute when there were no paths.
Now it needs a check, to avoid trying to run all steps (this is a problem for steps that use `default_condition`).
4. Change `RunDescription` to have a list of pathsets, rather than a single path.
5. Remove paths as they're matched
This allows checking at the end that no invalid paths are left over.
Note that if two steps matched the same path, this will no longer run both;
but that's a bug anyway.
6. Handle suite paths separately from regular sets.
Running multiple suite paths at once instead of in separate `make_run` invocations is both tricky and not particularly useful.
The respective test Steps already handle this by introspecting the original paths.
Avoid having to deal with it by moving suite handling into a seperate loop than `PathSet::Set` checks.
2022-04-22 03:19:36 +00:00
|
|
|
// Handle all test suite paths.
|
|
|
|
// (This is separate from the loop below to avoid having to handle multiple paths in `is_suite_path` somehow.)
|
|
|
|
paths.retain(|path| {
|
2020-10-09 17:51:07 +00:00
|
|
|
for (desc, should_run) in v.iter().zip(&should_runs) {
|
Pass all paths to `Step::run` at once when using `ShouldRun::krate`
This was surprisingly complicated. The main changes are:
1. Invert the order of iteration in `StepDescription::run`.
Previously, it did something like:
```python
for path in paths:
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_path(path):
step.run(builder, set)
```
That worked ok for individual paths, but didn't allow passing more than one path at a time to `Step::run`
(since `pathset_for_paths` only had one path available to it).
Change it to instead look at the intersection of `paths` and `should_run.paths`:
```python
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_paths(paths):
step.run(builder, set)
```
2. Change `pathset_for_path` to take multiple pathsets.
The goal is to avoid `x test library/alloc` testing *all* library crates, instead of just alloc.
The changes here are similarly subtle, to use the intersection between the paths rather than all
paths in `should_run.paths`. I added a test for the behavior to try and make it more clear.
Note that we use pathsets instead of just paths to allow for sets with multiple aliases (*cough* `all_krates` *cough*).
See the documentation added in the next commit for more detail.
3. Change `StepDescription::run` to explicitly handle 0 paths.
Before this was implicitly handled by the `for` loop, which just didn't excute when there were no paths.
Now it needs a check, to avoid trying to run all steps (this is a problem for steps that use `default_condition`).
4. Change `RunDescription` to have a list of pathsets, rather than a single path.
5. Remove paths as they're matched
This allows checking at the end that no invalid paths are left over.
Note that if two steps matched the same path, this will no longer run both;
but that's a bug anyway.
6. Handle suite paths separately from regular sets.
Running multiple suite paths at once instead of in separate `make_run` invocations is both tricky and not particularly useful.
The respective test Steps already handle this by introspecting the original paths.
Avoid having to deal with it by moving suite handling into a seperate loop than `PathSet::Set` checks.
2022-04-22 03:19:36 +00:00
|
|
|
if let Some(suite) = should_run.is_suite_path(&path) {
|
|
|
|
desc.maybe_run(builder, vec![suite.clone()]);
|
|
|
|
return false;
|
2017-07-19 12:55:46 +00:00
|
|
|
}
|
|
|
|
}
|
Pass all paths to `Step::run` at once when using `ShouldRun::krate`
This was surprisingly complicated. The main changes are:
1. Invert the order of iteration in `StepDescription::run`.
Previously, it did something like:
```python
for path in paths:
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_path(path):
step.run(builder, set)
```
That worked ok for individual paths, but didn't allow passing more than one path at a time to `Step::run`
(since `pathset_for_paths` only had one path available to it).
Change it to instead look at the intersection of `paths` and `should_run.paths`:
```python
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_paths(paths):
step.run(builder, set)
```
2. Change `pathset_for_path` to take multiple pathsets.
The goal is to avoid `x test library/alloc` testing *all* library crates, instead of just alloc.
The changes here are similarly subtle, to use the intersection between the paths rather than all
paths in `should_run.paths`. I added a test for the behavior to try and make it more clear.
Note that we use pathsets instead of just paths to allow for sets with multiple aliases (*cough* `all_krates` *cough*).
See the documentation added in the next commit for more detail.
3. Change `StepDescription::run` to explicitly handle 0 paths.
Before this was implicitly handled by the `for` loop, which just didn't excute when there were no paths.
Now it needs a check, to avoid trying to run all steps (this is a problem for steps that use `default_condition`).
4. Change `RunDescription` to have a list of pathsets, rather than a single path.
5. Remove paths as they're matched
This allows checking at the end that no invalid paths are left over.
Note that if two steps matched the same path, this will no longer run both;
but that's a bug anyway.
6. Handle suite paths separately from regular sets.
Running multiple suite paths at once instead of in separate `make_run` invocations is both tricky and not particularly useful.
The respective test Steps already handle this by introspecting the original paths.
Avoid having to deal with it by moving suite handling into a seperate loop than `PathSet::Set` checks.
2022-04-22 03:19:36 +00:00
|
|
|
true
|
|
|
|
});
|
|
|
|
|
|
|
|
if paths.is_empty() {
|
|
|
|
return;
|
|
|
|
}
|
2020-10-09 17:51:07 +00:00
|
|
|
|
Pass all paths to `Step::run` at once when using `ShouldRun::krate`
This was surprisingly complicated. The main changes are:
1. Invert the order of iteration in `StepDescription::run`.
Previously, it did something like:
```python
for path in paths:
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_path(path):
step.run(builder, set)
```
That worked ok for individual paths, but didn't allow passing more than one path at a time to `Step::run`
(since `pathset_for_paths` only had one path available to it).
Change it to instead look at the intersection of `paths` and `should_run.paths`:
```python
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_paths(paths):
step.run(builder, set)
```
2. Change `pathset_for_path` to take multiple pathsets.
The goal is to avoid `x test library/alloc` testing *all* library crates, instead of just alloc.
The changes here are similarly subtle, to use the intersection between the paths rather than all
paths in `should_run.paths`. I added a test for the behavior to try and make it more clear.
Note that we use pathsets instead of just paths to allow for sets with multiple aliases (*cough* `all_krates` *cough*).
See the documentation added in the next commit for more detail.
3. Change `StepDescription::run` to explicitly handle 0 paths.
Before this was implicitly handled by the `for` loop, which just didn't excute when there were no paths.
Now it needs a check, to avoid trying to run all steps (this is a problem for steps that use `default_condition`).
4. Change `RunDescription` to have a list of pathsets, rather than a single path.
5. Remove paths as they're matched
This allows checking at the end that no invalid paths are left over.
Note that if two steps matched the same path, this will no longer run both;
but that's a bug anyway.
6. Handle suite paths separately from regular sets.
Running multiple suite paths at once instead of in separate `make_run` invocations is both tricky and not particularly useful.
The respective test Steps already handle this by introspecting the original paths.
Avoid having to deal with it by moving suite handling into a seperate loop than `PathSet::Set` checks.
2022-04-22 03:19:36 +00:00
|
|
|
// Handle all PathSets.
|
|
|
|
for (desc, should_run) in v.iter().zip(&should_runs) {
|
|
|
|
let pathsets = should_run.pathset_for_paths_removing_matches(&mut paths, desc.kind);
|
|
|
|
if !pathsets.is_empty() {
|
|
|
|
desc.maybe_run(builder, pathsets);
|
2020-10-09 17:51:07 +00:00
|
|
|
}
|
2017-07-19 12:55:46 +00:00
|
|
|
}
|
Pass all paths to `Step::run` at once when using `ShouldRun::krate`
This was surprisingly complicated. The main changes are:
1. Invert the order of iteration in `StepDescription::run`.
Previously, it did something like:
```python
for path in paths:
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_path(path):
step.run(builder, set)
```
That worked ok for individual paths, but didn't allow passing more than one path at a time to `Step::run`
(since `pathset_for_paths` only had one path available to it).
Change it to instead look at the intersection of `paths` and `should_run.paths`:
```python
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_paths(paths):
step.run(builder, set)
```
2. Change `pathset_for_path` to take multiple pathsets.
The goal is to avoid `x test library/alloc` testing *all* library crates, instead of just alloc.
The changes here are similarly subtle, to use the intersection between the paths rather than all
paths in `should_run.paths`. I added a test for the behavior to try and make it more clear.
Note that we use pathsets instead of just paths to allow for sets with multiple aliases (*cough* `all_krates` *cough*).
See the documentation added in the next commit for more detail.
3. Change `StepDescription::run` to explicitly handle 0 paths.
Before this was implicitly handled by the `for` loop, which just didn't excute when there were no paths.
Now it needs a check, to avoid trying to run all steps (this is a problem for steps that use `default_condition`).
4. Change `RunDescription` to have a list of pathsets, rather than a single path.
5. Remove paths as they're matched
This allows checking at the end that no invalid paths are left over.
Note that if two steps matched the same path, this will no longer run both;
but that's a bug anyway.
6. Handle suite paths separately from regular sets.
Running multiple suite paths at once instead of in separate `make_run` invocations is both tricky and not particularly useful.
The respective test Steps already handle this by introspecting the original paths.
Avoid having to deal with it by moving suite handling into a seperate loop than `PathSet::Set` checks.
2022-04-22 03:19:36 +00:00
|
|
|
|
|
|
|
if !paths.is_empty() {
|
|
|
|
eprintln!("error: no `{}` rules matched {:?}", builder.kind.as_str(), paths,);
|
|
|
|
eprintln!(
|
|
|
|
"help: run `x.py {} --help --verbose` to show a list of available paths",
|
|
|
|
builder.kind.as_str()
|
|
|
|
);
|
|
|
|
eprintln!(
|
|
|
|
"note: if you are adding a new Step to bootstrap itself, make sure you register it with `describe!`"
|
|
|
|
);
|
2022-07-06 06:05:44 +00:00
|
|
|
crate::detail_exit(1);
|
Pass all paths to `Step::run` at once when using `ShouldRun::krate`
This was surprisingly complicated. The main changes are:
1. Invert the order of iteration in `StepDescription::run`.
Previously, it did something like:
```python
for path in paths:
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_path(path):
step.run(builder, set)
```
That worked ok for individual paths, but didn't allow passing more than one path at a time to `Step::run`
(since `pathset_for_paths` only had one path available to it).
Change it to instead look at the intersection of `paths` and `should_run.paths`:
```python
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_paths(paths):
step.run(builder, set)
```
2. Change `pathset_for_path` to take multiple pathsets.
The goal is to avoid `x test library/alloc` testing *all* library crates, instead of just alloc.
The changes here are similarly subtle, to use the intersection between the paths rather than all
paths in `should_run.paths`. I added a test for the behavior to try and make it more clear.
Note that we use pathsets instead of just paths to allow for sets with multiple aliases (*cough* `all_krates` *cough*).
See the documentation added in the next commit for more detail.
3. Change `StepDescription::run` to explicitly handle 0 paths.
Before this was implicitly handled by the `for` loop, which just didn't excute when there were no paths.
Now it needs a check, to avoid trying to run all steps (this is a problem for steps that use `default_condition`).
4. Change `RunDescription` to have a list of pathsets, rather than a single path.
5. Remove paths as they're matched
This allows checking at the end that no invalid paths are left over.
Note that if two steps matched the same path, this will no longer run both;
but that's a bug anyway.
6. Handle suite paths separately from regular sets.
Running multiple suite paths at once instead of in separate `make_run` invocations is both tricky and not particularly useful.
The respective test Steps already handle this by introspecting the original paths.
Avoid having to deal with it by moving suite handling into a seperate loop than `PathSet::Set` checks.
2022-04-22 03:19:36 +00:00
|
|
|
}
|
2017-07-19 12:55:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-06-08 21:09:56 +00:00
|
|
|
enum ReallyDefault<'a> {
|
|
|
|
Bool(bool),
|
|
|
|
Lazy(Lazy<bool, Box<dyn Fn() -> bool + 'a>>),
|
|
|
|
}
|
|
|
|
|
2017-07-19 00:03:38 +00:00
|
|
|
pub struct ShouldRun<'a> {
|
2017-07-20 23:24:11 +00:00
|
|
|
pub builder: &'a Builder<'a>,
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
kind: Kind,
|
|
|
|
|
2017-07-19 00:03:38 +00:00
|
|
|
// use a BTreeSet to maintain sort order
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 16:51:58 +00:00
|
|
|
paths: BTreeSet<PathSet>,
|
2017-07-20 23:24:11 +00:00
|
|
|
|
|
|
|
// If this is a default rule, this is an additional constraint placed on
|
2018-02-21 19:13:34 +00:00
|
|
|
// its run. Generally something like compiler docs being enabled.
|
2021-06-08 21:09:56 +00:00
|
|
|
is_really_default: ReallyDefault<'a>,
|
2017-07-19 00:03:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> ShouldRun<'a> {
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
fn new(builder: &'a Builder<'_>, kind: Kind) -> ShouldRun<'a> {
|
2017-07-19 00:03:38 +00:00
|
|
|
ShouldRun {
|
2017-08-07 05:54:09 +00:00
|
|
|
builder,
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
kind,
|
2017-07-19 00:03:38 +00:00
|
|
|
paths: BTreeSet::new(),
|
2021-06-08 21:09:56 +00:00
|
|
|
is_really_default: ReallyDefault::Bool(true), // by default no additional conditions
|
2017-07-19 00:03:38 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-20 23:24:11 +00:00
|
|
|
pub fn default_condition(mut self, cond: bool) -> Self {
|
2021-06-08 21:09:56 +00:00
|
|
|
self.is_really_default = ReallyDefault::Bool(cond);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn lazy_default_condition(mut self, lazy_cond: Box<dyn Fn() -> bool + 'a>) -> Self {
|
|
|
|
self.is_really_default = ReallyDefault::Lazy(Lazy::new(lazy_cond));
|
2017-07-20 23:24:11 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2021-06-08 21:09:56 +00:00
|
|
|
pub fn is_really_default(&self) -> bool {
|
|
|
|
match &self.is_really_default {
|
|
|
|
ReallyDefault::Bool(val) => *val,
|
|
|
|
ReallyDefault::Lazy(lazy) => *lazy.deref(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-15 00:00:34 +00:00
|
|
|
/// Indicates it should run if the command-line selects the given crate or
|
|
|
|
/// any of its (local) dependencies.
|
|
|
|
///
|
|
|
|
/// Compared to `krate`, this treats the dependencies as aliases for the
|
|
|
|
/// same job. Generally it is preferred to use `krate`, and treat each
|
|
|
|
/// individual path separately. For example `./x.py test src/liballoc`
|
|
|
|
/// (which uses `krate`) will test just `liballoc`. However, `./x.py check
|
|
|
|
/// src/liballoc` (which uses `all_krates`) will check all of `libtest`.
|
|
|
|
/// `all_krates` should probably be removed at some point.
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 16:51:58 +00:00
|
|
|
pub fn all_krates(mut self, name: &str) -> Self {
|
|
|
|
let mut set = BTreeSet::new();
|
2020-10-25 12:13:14 +00:00
|
|
|
for krate in self.builder.in_tree_crates(name, None) {
|
2020-06-14 22:57:21 +00:00
|
|
|
let path = krate.local_path(self.builder);
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
set.insert(TaskPath { path, kind: Some(self.kind) });
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 16:51:58 +00:00
|
|
|
}
|
2018-04-12 11:49:31 +00:00
|
|
|
self.paths.insert(PathSet::Set(set));
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 16:51:58 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2020-06-15 00:00:34 +00:00
|
|
|
/// Indicates it should run if the command-line selects the given crate or
|
|
|
|
/// any of its (local) dependencies.
|
|
|
|
///
|
Pass all paths to `Step::run` at once when using `ShouldRun::krate`
This was surprisingly complicated. The main changes are:
1. Invert the order of iteration in `StepDescription::run`.
Previously, it did something like:
```python
for path in paths:
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_path(path):
step.run(builder, set)
```
That worked ok for individual paths, but didn't allow passing more than one path at a time to `Step::run`
(since `pathset_for_paths` only had one path available to it).
Change it to instead look at the intersection of `paths` and `should_run.paths`:
```python
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_paths(paths):
step.run(builder, set)
```
2. Change `pathset_for_path` to take multiple pathsets.
The goal is to avoid `x test library/alloc` testing *all* library crates, instead of just alloc.
The changes here are similarly subtle, to use the intersection between the paths rather than all
paths in `should_run.paths`. I added a test for the behavior to try and make it more clear.
Note that we use pathsets instead of just paths to allow for sets with multiple aliases (*cough* `all_krates` *cough*).
See the documentation added in the next commit for more detail.
3. Change `StepDescription::run` to explicitly handle 0 paths.
Before this was implicitly handled by the `for` loop, which just didn't excute when there were no paths.
Now it needs a check, to avoid trying to run all steps (this is a problem for steps that use `default_condition`).
4. Change `RunDescription` to have a list of pathsets, rather than a single path.
5. Remove paths as they're matched
This allows checking at the end that no invalid paths are left over.
Note that if two steps matched the same path, this will no longer run both;
but that's a bug anyway.
6. Handle suite paths separately from regular sets.
Running multiple suite paths at once instead of in separate `make_run` invocations is both tricky and not particularly useful.
The respective test Steps already handle this by introspecting the original paths.
Avoid having to deal with it by moving suite handling into a seperate loop than `PathSet::Set` checks.
2022-04-22 03:19:36 +00:00
|
|
|
/// `make_run` will be called a single time with all matching command-line paths.
|
2022-06-27 02:07:27 +00:00
|
|
|
pub fn crate_or_deps(self, name: &str) -> Self {
|
|
|
|
let crates = self.builder.in_tree_crates(name, None);
|
|
|
|
self.crates(crates)
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Indicates it should run if the command-line selects any of the given crates.
|
|
|
|
///
|
|
|
|
/// `make_run` will be called a single time with all matching command-line paths.
|
|
|
|
pub(crate) fn crates(mut self, crates: Vec<&Crate>) -> Self {
|
|
|
|
for krate in crates {
|
2020-06-14 22:57:21 +00:00
|
|
|
let path = krate.local_path(self.builder);
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
self.paths.insert(PathSet::one(path, self.kind));
|
2017-07-19 00:03:38 +00:00
|
|
|
}
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2022-04-10 22:09:56 +00:00
|
|
|
// single alias, which does not correspond to any on-disk path
|
|
|
|
pub fn alias(mut self, alias: &str) -> Self {
|
|
|
|
assert!(
|
|
|
|
!self.builder.src.join(alias).exists(),
|
|
|
|
"use `builder.path()` for real paths: {}",
|
|
|
|
alias
|
|
|
|
);
|
|
|
|
self.paths.insert(PathSet::Set(
|
|
|
|
std::iter::once(TaskPath { path: alias.into(), kind: Some(self.kind) }).collect(),
|
|
|
|
));
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 16:51:58 +00:00
|
|
|
// single, non-aliased path
|
|
|
|
pub fn path(self, path: &str) -> Self {
|
|
|
|
self.paths(&[path])
|
|
|
|
}
|
|
|
|
|
|
|
|
// multiple aliases for the same job
|
|
|
|
pub fn paths(mut self, paths: &[&str]) -> Self {
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
self.paths.insert(PathSet::Set(
|
2022-04-10 22:09:56 +00:00
|
|
|
paths
|
|
|
|
.iter()
|
|
|
|
.map(|p| {
|
2022-04-19 01:21:19 +00:00
|
|
|
// FIXME(#96188): make sure this is actually a path.
|
|
|
|
// This currently breaks for paths within submodules.
|
|
|
|
//assert!(
|
|
|
|
// self.builder.src.join(p).exists(),
|
|
|
|
// "`should_run.paths` should correspond to real on-disk paths - use `alias` if there is no relevant path: {}",
|
|
|
|
// p
|
|
|
|
//);
|
2022-04-10 22:09:56 +00:00
|
|
|
TaskPath { path: p.into(), kind: Some(self.kind) }
|
|
|
|
})
|
|
|
|
.collect(),
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
));
|
2018-04-12 11:49:31 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
Pass all paths to `Step::run` at once when using `ShouldRun::krate`
This was surprisingly complicated. The main changes are:
1. Invert the order of iteration in `StepDescription::run`.
Previously, it did something like:
```python
for path in paths:
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_path(path):
step.run(builder, set)
```
That worked ok for individual paths, but didn't allow passing more than one path at a time to `Step::run`
(since `pathset_for_paths` only had one path available to it).
Change it to instead look at the intersection of `paths` and `should_run.paths`:
```python
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_paths(paths):
step.run(builder, set)
```
2. Change `pathset_for_path` to take multiple pathsets.
The goal is to avoid `x test library/alloc` testing *all* library crates, instead of just alloc.
The changes here are similarly subtle, to use the intersection between the paths rather than all
paths in `should_run.paths`. I added a test for the behavior to try and make it more clear.
Note that we use pathsets instead of just paths to allow for sets with multiple aliases (*cough* `all_krates` *cough*).
See the documentation added in the next commit for more detail.
3. Change `StepDescription::run` to explicitly handle 0 paths.
Before this was implicitly handled by the `for` loop, which just didn't excute when there were no paths.
Now it needs a check, to avoid trying to run all steps (this is a problem for steps that use `default_condition`).
4. Change `RunDescription` to have a list of pathsets, rather than a single path.
5. Remove paths as they're matched
This allows checking at the end that no invalid paths are left over.
Note that if two steps matched the same path, this will no longer run both;
but that's a bug anyway.
6. Handle suite paths separately from regular sets.
Running multiple suite paths at once instead of in separate `make_run` invocations is both tricky and not particularly useful.
The respective test Steps already handle this by introspecting the original paths.
Avoid having to deal with it by moving suite handling into a seperate loop than `PathSet::Set` checks.
2022-04-22 03:19:36 +00:00
|
|
|
/// Handles individual files (not directories) within a test suite.
|
|
|
|
fn is_suite_path(&self, requested_path: &Path) -> Option<&PathSet> {
|
2018-05-30 17:33:43 +00:00
|
|
|
self.paths.iter().find(|pathset| match pathset {
|
Pass all paths to `Step::run` at once when using `ShouldRun::krate`
This was surprisingly complicated. The main changes are:
1. Invert the order of iteration in `StepDescription::run`.
Previously, it did something like:
```python
for path in paths:
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_path(path):
step.run(builder, set)
```
That worked ok for individual paths, but didn't allow passing more than one path at a time to `Step::run`
(since `pathset_for_paths` only had one path available to it).
Change it to instead look at the intersection of `paths` and `should_run.paths`:
```python
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_paths(paths):
step.run(builder, set)
```
2. Change `pathset_for_path` to take multiple pathsets.
The goal is to avoid `x test library/alloc` testing *all* library crates, instead of just alloc.
The changes here are similarly subtle, to use the intersection between the paths rather than all
paths in `should_run.paths`. I added a test for the behavior to try and make it more clear.
Note that we use pathsets instead of just paths to allow for sets with multiple aliases (*cough* `all_krates` *cough*).
See the documentation added in the next commit for more detail.
3. Change `StepDescription::run` to explicitly handle 0 paths.
Before this was implicitly handled by the `for` loop, which just didn't excute when there were no paths.
Now it needs a check, to avoid trying to run all steps (this is a problem for steps that use `default_condition`).
4. Change `RunDescription` to have a list of pathsets, rather than a single path.
5. Remove paths as they're matched
This allows checking at the end that no invalid paths are left over.
Note that if two steps matched the same path, this will no longer run both;
but that's a bug anyway.
6. Handle suite paths separately from regular sets.
Running multiple suite paths at once instead of in separate `make_run` invocations is both tricky and not particularly useful.
The respective test Steps already handle this by introspecting the original paths.
Avoid having to deal with it by moving suite handling into a seperate loop than `PathSet::Set` checks.
2022-04-22 03:19:36 +00:00
|
|
|
PathSet::Suite(suite) => requested_path.starts_with(&suite.path),
|
2018-05-30 17:33:43 +00:00
|
|
|
PathSet::Set(_) => false,
|
2018-04-12 11:49:31 +00:00
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn suite_path(mut self, suite: &str) -> Self {
|
2022-03-11 19:38:31 +00:00
|
|
|
self.paths.insert(PathSet::Suite(TaskPath { path: suite.into(), kind: Some(self.kind) }));
|
2017-07-19 00:03:38 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
// allows being more explicit about why should_run in Step returns the value passed to it
|
2018-02-14 01:42:26 +00:00
|
|
|
pub fn never(mut self) -> ShouldRun<'a> {
|
|
|
|
self.paths.insert(PathSet::empty());
|
2017-07-19 00:03:38 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
Pass all paths to `Step::run` at once when using `ShouldRun::krate`
This was surprisingly complicated. The main changes are:
1. Invert the order of iteration in `StepDescription::run`.
Previously, it did something like:
```python
for path in paths:
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_path(path):
step.run(builder, set)
```
That worked ok for individual paths, but didn't allow passing more than one path at a time to `Step::run`
(since `pathset_for_paths` only had one path available to it).
Change it to instead look at the intersection of `paths` and `should_run.paths`:
```python
for (step, should_run) in should_runs:
if let Some(set) = should_run.pathset_for_paths(paths):
step.run(builder, set)
```
2. Change `pathset_for_path` to take multiple pathsets.
The goal is to avoid `x test library/alloc` testing *all* library crates, instead of just alloc.
The changes here are similarly subtle, to use the intersection between the paths rather than all
paths in `should_run.paths`. I added a test for the behavior to try and make it more clear.
Note that we use pathsets instead of just paths to allow for sets with multiple aliases (*cough* `all_krates` *cough*).
See the documentation added in the next commit for more detail.
3. Change `StepDescription::run` to explicitly handle 0 paths.
Before this was implicitly handled by the `for` loop, which just didn't excute when there were no paths.
Now it needs a check, to avoid trying to run all steps (this is a problem for steps that use `default_condition`).
4. Change `RunDescription` to have a list of pathsets, rather than a single path.
5. Remove paths as they're matched
This allows checking at the end that no invalid paths are left over.
Note that if two steps matched the same path, this will no longer run both;
but that's a bug anyway.
6. Handle suite paths separately from regular sets.
Running multiple suite paths at once instead of in separate `make_run` invocations is both tricky and not particularly useful.
The respective test Steps already handle this by introspecting the original paths.
Avoid having to deal with it by moving suite handling into a seperate loop than `PathSet::Set` checks.
2022-04-22 03:19:36 +00:00
|
|
|
/// Given a set of requested paths, return the subset which match the Step for this `ShouldRun`,
|
|
|
|
/// removing the matches from `paths`.
|
|
|
|
///
|
|
|
|
/// NOTE: this returns multiple PathSets to allow for the possibility of multiple units of work
|
|
|
|
/// within the same step. For example, `test::Crate` allows testing multiple crates in the same
|
|
|
|
/// cargo invocation, which are put into separate sets because they aren't aliases.
|
|
|
|
///
|
|
|
|
/// The reason we return PathSet instead of PathBuf is to allow for aliases that mean the same thing
|
|
|
|
/// (for now, just `all_krates` and `paths`, but we may want to add an `aliases` function in the future?)
|
|
|
|
fn pathset_for_paths_removing_matches(
|
|
|
|
&self,
|
|
|
|
paths: &mut Vec<&Path>,
|
|
|
|
kind: Kind,
|
|
|
|
) -> Vec<PathSet> {
|
|
|
|
let mut sets = vec![];
|
|
|
|
for pathset in &self.paths {
|
|
|
|
let subset = pathset.intersection_removing_matches(paths, Some(kind));
|
|
|
|
if subset != PathSet::empty() {
|
|
|
|
sets.push(subset);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sets
|
2017-07-19 00:03:38 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug)]
|
2017-07-05 16:20:20 +00:00
|
|
|
pub enum Kind {
|
|
|
|
Build,
|
2018-01-15 17:44:00 +00:00
|
|
|
Check,
|
2018-12-04 18:26:54 +00:00
|
|
|
Clippy,
|
|
|
|
Fix,
|
2022-04-13 04:56:47 +00:00
|
|
|
Format,
|
2017-07-05 16:20:20 +00:00
|
|
|
Test,
|
|
|
|
Bench,
|
|
|
|
Doc,
|
2022-04-13 04:56:47 +00:00
|
|
|
Clean,
|
|
|
|
Dist,
|
2017-07-05 16:20:20 +00:00
|
|
|
Install,
|
2019-11-26 11:06:30 +00:00
|
|
|
Run,
|
2022-04-13 04:56:47 +00:00
|
|
|
Setup,
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
|
|
|
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
impl Kind {
|
2022-04-13 04:56:47 +00:00
|
|
|
pub fn parse(string: &str) -> Option<Kind> {
|
|
|
|
// these strings, including the one-letter aliases, must match the x.py help text
|
|
|
|
Some(match string {
|
|
|
|
"build" | "b" => Kind::Build,
|
|
|
|
"check" | "c" => Kind::Check,
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
"clippy" => Kind::Clippy,
|
|
|
|
"fix" => Kind::Fix,
|
2022-04-13 04:56:47 +00:00
|
|
|
"fmt" => Kind::Format,
|
|
|
|
"test" | "t" => Kind::Test,
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
"bench" => Kind::Bench,
|
2022-04-13 04:56:47 +00:00
|
|
|
"doc" | "d" => Kind::Doc,
|
|
|
|
"clean" => Kind::Clean,
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
"dist" => Kind::Dist,
|
|
|
|
"install" => Kind::Install,
|
2022-04-13 04:56:47 +00:00
|
|
|
"run" | "r" => Kind::Run,
|
|
|
|
"setup" => Kind::Setup,
|
|
|
|
_ => return None,
|
|
|
|
})
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
}
|
|
|
|
|
2022-04-13 04:56:47 +00:00
|
|
|
pub fn as_str(&self) -> &'static str {
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
match self {
|
|
|
|
Kind::Build => "build",
|
|
|
|
Kind::Check => "check",
|
|
|
|
Kind::Clippy => "clippy",
|
|
|
|
Kind::Fix => "fix",
|
2022-04-13 04:56:47 +00:00
|
|
|
Kind::Format => "fmt",
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
Kind::Test => "test",
|
|
|
|
Kind::Bench => "bench",
|
|
|
|
Kind::Doc => "doc",
|
2022-04-13 04:56:47 +00:00
|
|
|
Kind::Clean => "clean",
|
|
|
|
Kind::Dist => "dist",
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
Kind::Install => "install",
|
|
|
|
Kind::Run => "run",
|
2022-04-13 04:56:47 +00:00
|
|
|
Kind::Setup => "setup",
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-19 12:55:46 +00:00
|
|
|
impl<'a> Builder<'a> {
|
|
|
|
fn get_step_descriptions(kind: Kind) -> Vec<StepDescription> {
|
|
|
|
macro_rules! describe {
|
2019-02-24 12:59:44 +00:00
|
|
|
($($rule:ty),+ $(,)?) => {{
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
vec![$(StepDescription::from::<$rule>(kind)),+]
|
2017-07-19 12:55:46 +00:00
|
|
|
}};
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
2017-07-19 12:55:46 +00:00
|
|
|
match kind {
|
2018-05-30 17:33:43 +00:00
|
|
|
Kind::Build => describe!(
|
|
|
|
compile::Std,
|
2022-06-27 02:07:27 +00:00
|
|
|
compile::Rustc,
|
2021-10-11 04:09:15 +00:00
|
|
|
compile::Assemble,
|
2020-10-15 12:23:43 +00:00
|
|
|
compile::CodegenBackend,
|
2018-05-30 17:33:43 +00:00
|
|
|
compile::StartupObjects,
|
|
|
|
tool::BuildManifest,
|
|
|
|
tool::Rustbook,
|
|
|
|
tool::ErrorIndex,
|
|
|
|
tool::UnstableBookGen,
|
|
|
|
tool::Tidy,
|
|
|
|
tool::Linkchecker,
|
|
|
|
tool::CargoTest,
|
|
|
|
tool::Compiletest,
|
|
|
|
tool::RemoteTestServer,
|
|
|
|
tool::RemoteTestClient,
|
|
|
|
tool::RustInstaller,
|
|
|
|
tool::Cargo,
|
|
|
|
tool::Rls,
|
Add rust-analyzer submodule
The current plan is that submodule tracks the `release` branch of
rust-analyzer, which is updated once a week.
rust-analyzer is a workspace (with a virtual manifest), the actual
binary is provide by `crates/rust-analyzer` package.
Note that we intentionally don't add rust-analyzer to `Kind::Test`,
for two reasons.
*First*, at the moment rust-analyzer's test suite does a couple of
things which might not work in the context of rust repository. For
example, it shells out directly to `rustup` and `rustfmt`. So, making
this work requires non-trivial efforts.
*Second*, it seems unlikely that running tests in rust-lang/rust repo
would provide any additional guarantees. rust-analyzer builds with
stable and does not depend on the specifics of the compiler, so
changes to compiler can't break ra, unless they break stability
guarantee. Additionally, rust-analyzer itself is gated on bors, so we
are pretty confident that test suite passes.
2020-06-04 11:11:15 +00:00
|
|
|
tool::RustAnalyzer,
|
2022-07-26 14:25:48 +00:00
|
|
|
tool::RustAnalyzerProcMacroSrv,
|
2020-07-02 18:27:15 +00:00
|
|
|
tool::RustDemangler,
|
2018-05-30 17:33:43 +00:00
|
|
|
tool::Rustdoc,
|
|
|
|
tool::Clippy,
|
2020-06-01 18:17:20 +00:00
|
|
|
tool::CargoClippy,
|
2018-05-30 17:33:43 +00:00
|
|
|
native::Llvm,
|
2019-11-07 00:00:00 +00:00
|
|
|
native::Sanitizers,
|
2018-05-30 17:33:43 +00:00
|
|
|
tool::Rustfmt,
|
|
|
|
tool::Miri,
|
2020-06-01 18:17:20 +00:00
|
|
|
tool::CargoMiri,
|
2021-05-17 03:22:07 +00:00
|
|
|
native::Lld,
|
|
|
|
native::CrtBeginEnd
|
2018-05-30 17:33:43 +00:00
|
|
|
),
|
2022-05-08 01:54:38 +00:00
|
|
|
Kind::Check | Kind::Clippy | Kind::Fix => describe!(
|
2020-10-15 12:23:43 +00:00
|
|
|
check::Std,
|
|
|
|
check::Rustc,
|
|
|
|
check::Rustdoc,
|
|
|
|
check::CodegenBackend,
|
|
|
|
check::Clippy,
|
2021-05-07 20:06:01 +00:00
|
|
|
check::Miri,
|
|
|
|
check::Rls,
|
2022-07-22 14:23:40 +00:00
|
|
|
check::RustAnalyzer,
|
2021-02-17 03:37:17 +00:00
|
|
|
check::Rustfmt,
|
2020-10-15 12:23:43 +00:00
|
|
|
check::Bootstrap
|
|
|
|
),
|
2018-05-30 17:33:43 +00:00
|
|
|
Kind::Test => describe!(
|
2019-11-23 17:43:21 +00:00
|
|
|
crate::toolstate::ToolStateCheck,
|
2019-11-26 11:06:30 +00:00
|
|
|
test::ExpandYamlAnchors,
|
2018-05-30 17:33:43 +00:00
|
|
|
test::Tidy,
|
|
|
|
test::Ui,
|
|
|
|
test::RunPassValgrind,
|
|
|
|
test::MirOpt,
|
|
|
|
test::Codegen,
|
|
|
|
test::CodegenUnits,
|
2019-03-16 22:40:43 +00:00
|
|
|
test::Assembly,
|
2018-05-30 17:33:43 +00:00
|
|
|
test::Incremental,
|
|
|
|
test::Debuginfo,
|
|
|
|
test::UiFullDeps,
|
|
|
|
test::Rustdoc,
|
|
|
|
test::Pretty,
|
|
|
|
test::Crate,
|
|
|
|
test::CrateLibrustc,
|
|
|
|
test::CrateRustdoc,
|
2021-03-06 20:37:07 +00:00
|
|
|
test::CrateRustdocJsonTypes,
|
2018-05-30 17:33:43 +00:00
|
|
|
test::Linkcheck,
|
2020-08-11 23:49:39 +00:00
|
|
|
test::TierCheck,
|
2018-05-30 17:33:43 +00:00
|
|
|
test::Cargotest,
|
|
|
|
test::Cargo,
|
|
|
|
test::Rls,
|
2022-07-22 15:21:33 +00:00
|
|
|
test::RustAnalyzer,
|
2018-05-30 17:33:43 +00:00
|
|
|
test::ErrorIndex,
|
|
|
|
test::Distcheck,
|
2018-03-09 17:26:15 +00:00
|
|
|
test::RunMakeFullDeps,
|
2018-05-30 17:33:43 +00:00
|
|
|
test::Nomicon,
|
|
|
|
test::Reference,
|
|
|
|
test::RustdocBook,
|
|
|
|
test::RustByExample,
|
|
|
|
test::TheBook,
|
|
|
|
test::UnstableBook,
|
|
|
|
test::RustcBook,
|
2020-11-28 21:29:51 +00:00
|
|
|
test::LintDocs,
|
2019-04-04 16:05:22 +00:00
|
|
|
test::RustcGuide,
|
2019-02-10 02:42:23 +00:00
|
|
|
test::EmbeddedBook,
|
2019-03-22 15:52:45 +00:00
|
|
|
test::EditionGuide,
|
2018-05-30 17:33:43 +00:00
|
|
|
test::Rustfmt,
|
|
|
|
test::Miri,
|
|
|
|
test::Clippy,
|
2021-03-26 20:02:46 +00:00
|
|
|
test::RustDemangler,
|
2018-12-13 20:57:23 +00:00
|
|
|
test::CompiletestTest,
|
2019-02-23 23:08:43 +00:00
|
|
|
test::RustdocJSStd,
|
2019-02-09 19:28:22 +00:00
|
|
|
test::RustdocJSNotStd,
|
2021-02-21 13:21:04 +00:00
|
|
|
test::RustdocGUI,
|
2018-05-30 17:33:43 +00:00
|
|
|
test::RustdocTheme,
|
2019-03-14 05:35:48 +00:00
|
|
|
test::RustdocUi,
|
2020-11-29 16:16:25 +00:00
|
|
|
test::RustdocJson,
|
2021-04-23 14:43:18 +00:00
|
|
|
test::HtmlCheck,
|
2018-06-16 17:11:06 +00:00
|
|
|
// Run bootstrap close to the end as it's unlikely to fail
|
|
|
|
test::Bootstrap,
|
2018-03-20 14:33:22 +00:00
|
|
|
// Run run-make last, since these won't pass without make on Windows
|
2018-05-30 17:33:43 +00:00
|
|
|
test::RunMake,
|
|
|
|
),
|
2018-01-15 17:44:00 +00:00
|
|
|
Kind::Bench => describe!(test::Crate, test::CrateLibrustc),
|
2018-05-30 17:33:43 +00:00
|
|
|
Kind::Doc => describe!(
|
|
|
|
doc::UnstableBook,
|
|
|
|
doc::UnstableBookGen,
|
|
|
|
doc::TheBook,
|
|
|
|
doc::Standalone,
|
|
|
|
doc::Std,
|
|
|
|
doc::Rustc,
|
|
|
|
doc::Rustdoc,
|
2021-06-30 04:13:34 +00:00
|
|
|
doc::Rustfmt,
|
2018-05-30 17:33:43 +00:00
|
|
|
doc::ErrorIndex,
|
|
|
|
doc::Nomicon,
|
|
|
|
doc::Reference,
|
|
|
|
doc::RustdocBook,
|
|
|
|
doc::RustByExample,
|
|
|
|
doc::RustcBook,
|
2018-12-04 21:47:46 +00:00
|
|
|
doc::CargoBook,
|
2021-10-27 20:18:51 +00:00
|
|
|
doc::Clippy,
|
2022-07-03 15:35:24 +00:00
|
|
|
doc::ClippyBook,
|
2022-06-05 21:33:39 +00:00
|
|
|
doc::Miri,
|
2019-01-19 03:52:39 +00:00
|
|
|
doc::EmbeddedBook,
|
2018-12-04 21:47:46 +00:00
|
|
|
doc::EditionGuide,
|
2018-05-30 17:33:43 +00:00
|
|
|
),
|
|
|
|
Kind::Dist => describe!(
|
|
|
|
dist::Docs,
|
|
|
|
dist::RustcDocs,
|
|
|
|
dist::Mingw,
|
|
|
|
dist::Rustc,
|
|
|
|
dist::Std,
|
2019-09-26 21:44:08 +00:00
|
|
|
dist::RustcDev,
|
2018-05-30 17:33:43 +00:00
|
|
|
dist::Analysis,
|
|
|
|
dist::Src,
|
|
|
|
dist::Cargo,
|
|
|
|
dist::Rls,
|
Add rust-analyzer submodule
The current plan is that submodule tracks the `release` branch of
rust-analyzer, which is updated once a week.
rust-analyzer is a workspace (with a virtual manifest), the actual
binary is provide by `crates/rust-analyzer` package.
Note that we intentionally don't add rust-analyzer to `Kind::Test`,
for two reasons.
*First*, at the moment rust-analyzer's test suite does a couple of
things which might not work in the context of rust repository. For
example, it shells out directly to `rustup` and `rustfmt`. So, making
this work requires non-trivial efforts.
*Second*, it seems unlikely that running tests in rust-lang/rust repo
would provide any additional guarantees. rust-analyzer builds with
stable and does not depend on the specifics of the compiler, so
changes to compiler can't break ra, unless they break stability
guarantee. Additionally, rust-analyzer itself is gated on bors, so we
are pretty confident that test suite passes.
2020-06-04 11:11:15 +00:00
|
|
|
dist::RustAnalyzer,
|
2018-05-30 17:33:43 +00:00
|
|
|
dist::Rustfmt,
|
2021-03-26 20:02:46 +00:00
|
|
|
dist::RustDemangler,
|
2018-07-17 16:39:54 +00:00
|
|
|
dist::Clippy,
|
2018-12-23 20:20:35 +00:00
|
|
|
dist::Miri,
|
2018-05-30 06:01:35 +00:00
|
|
|
dist::LlvmTools,
|
2020-09-04 17:59:14 +00:00
|
|
|
dist::RustDev,
|
2018-05-30 17:33:43 +00:00
|
|
|
dist::Extended,
|
2022-01-18 18:40:59 +00:00
|
|
|
// It seems that PlainSourceTarball somehow changes how some of the tools
|
2022-03-30 05:39:38 +00:00
|
|
|
// perceive their dependencies (see #93033) which would invalidate fingerprints
|
2022-01-18 18:40:59 +00:00
|
|
|
// and force us to rebuild tools after vendoring dependencies.
|
|
|
|
// To work around this, create the Tarball after building all the tools.
|
|
|
|
dist::PlainSourceTarball,
|
2020-10-09 17:49:13 +00:00
|
|
|
dist::BuildManifest,
|
Utilize PGO for rustc linux dist builds
This implements support for applying PGO to the rustc compilation step (not
standard library or any tooling, including rustdoc). Expanding PGO to more tools
is not terribly difficult but will involve more work and greater CI time
commitment.
For the same reason of avoiding greater time commitment, this currently avoids
implementing for platforms outside of x86_64-unknown-linux-gnu, though in
practice it should be quite simple to extend over time to more platforms. The
initial implementation is intentionally minimal here to avoid too much work
investment before we start seeing wins for a subset of Rust users.
The choice of workloads to profile here is somewhat arbitrary, but the general
rationale was to aim for a small set that largely avoided time regressions on
perf.rust-lang.org's full suite of crates. The set chosen is libcore, cargo (and
its dependencies), and a few ad-hoc stress tests from perf.rlo. The stress tests
are arguably the most controversial, but they benefit those cases (avoiding
regressions) and do not really remove wins from other benchmarks.
The primary next step after this PR lands is to implement support for PGO in
LLVM. It is unclear whether we can afford a full LLVM rebuild in CI, though, so
the approach taken there may need to be more staggered. rustc-only PGO seems
well affordable on linux at least, giving us up to 20% wall time wins on some
crates for 15 minutes of extra CI time (1 hour up from 45 minutes).
The PGO data is uploaded to allow others to reuse it if attempting to reproduce
the CI build or potentially, in the future, on other platforms where an
off-by-one strategy is used for dist builds at minimal performance cost.
2020-12-14 18:50:59 +00:00
|
|
|
dist::ReproducibleArtifacts,
|
2018-05-30 17:33:43 +00:00
|
|
|
),
|
|
|
|
Kind::Install => describe!(
|
|
|
|
install::Docs,
|
|
|
|
install::Std,
|
|
|
|
install::Cargo,
|
|
|
|
install::Rls,
|
Add rust-analyzer submodule
The current plan is that submodule tracks the `release` branch of
rust-analyzer, which is updated once a week.
rust-analyzer is a workspace (with a virtual manifest), the actual
binary is provide by `crates/rust-analyzer` package.
Note that we intentionally don't add rust-analyzer to `Kind::Test`,
for two reasons.
*First*, at the moment rust-analyzer's test suite does a couple of
things which might not work in the context of rust repository. For
example, it shells out directly to `rustup` and `rustfmt`. So, making
this work requires non-trivial efforts.
*Second*, it seems unlikely that running tests in rust-lang/rust repo
would provide any additional guarantees. rust-analyzer builds with
stable and does not depend on the specifics of the compiler, so
changes to compiler can't break ra, unless they break stability
guarantee. Additionally, rust-analyzer itself is gated on bors, so we
are pretty confident that test suite passes.
2020-06-04 11:11:15 +00:00
|
|
|
install::RustAnalyzer,
|
2018-05-30 17:33:43 +00:00
|
|
|
install::Rustfmt,
|
2021-03-26 20:02:46 +00:00
|
|
|
install::RustDemangler,
|
2018-07-17 16:39:54 +00:00
|
|
|
install::Clippy,
|
2018-12-23 20:20:35 +00:00
|
|
|
install::Miri,
|
2018-05-30 17:33:43 +00:00
|
|
|
install::Analysis,
|
|
|
|
install::Src,
|
|
|
|
install::Rustc
|
|
|
|
),
|
2021-08-26 09:26:03 +00:00
|
|
|
Kind::Run => describe!(run::ExpandYamlAnchors, run::BuildManifest, run::BumpStage0),
|
2022-04-13 04:56:47 +00:00
|
|
|
// These commands either don't use paths, or they're special-cased in Build::build()
|
2022-05-08 01:54:38 +00:00
|
|
|
Kind::Clean | Kind::Format | Kind::Setup => vec![],
|
2017-07-19 12:55:46 +00:00
|
|
|
}
|
|
|
|
}
|
2017-07-05 16:20:20 +00:00
|
|
|
|
2022-04-13 04:56:47 +00:00
|
|
|
pub fn get_help(build: &Build, kind: Kind) -> Option<String> {
|
|
|
|
let step_descriptions = Builder::get_step_descriptions(kind);
|
|
|
|
if step_descriptions.is_empty() {
|
|
|
|
return None;
|
|
|
|
}
|
2017-07-19 00:03:38 +00:00
|
|
|
|
2020-07-02 12:07:56 +00:00
|
|
|
let builder = Self::new_internal(build, kind, vec![]);
|
2017-07-19 00:03:38 +00:00
|
|
|
let builder = &builder;
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
// The "build" kind here is just a placeholder, it will be replaced with something else in
|
|
|
|
// the following statement.
|
|
|
|
let mut should_run = ShouldRun::new(builder, Kind::Build);
|
2022-04-13 04:56:47 +00:00
|
|
|
for desc in step_descriptions {
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
should_run.kind = desc.kind;
|
2017-07-19 12:55:46 +00:00
|
|
|
should_run = (desc.should_run)(should_run);
|
2017-07-19 00:03:38 +00:00
|
|
|
}
|
|
|
|
let mut help = String::from("Available paths:\n");
|
2020-06-14 23:58:45 +00:00
|
|
|
let mut add_path = |path: &Path| {
|
2022-04-13 04:56:47 +00:00
|
|
|
t!(write!(help, " ./x.py {} {}\n", kind.as_str(), path.display()));
|
2020-06-14 23:58:45 +00:00
|
|
|
};
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 16:51:58 +00:00
|
|
|
for pathset in should_run.paths {
|
2020-06-14 23:58:45 +00:00
|
|
|
match pathset {
|
|
|
|
PathSet::Set(set) => {
|
|
|
|
for path in set {
|
2021-12-15 11:50:06 +00:00
|
|
|
add_path(&path.path);
|
2020-06-14 23:58:45 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
PathSet::Suite(path) => {
|
2021-12-15 11:50:06 +00:00
|
|
|
add_path(&path.path.join("..."));
|
2020-06-14 23:58:45 +00:00
|
|
|
}
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 16:51:58 +00:00
|
|
|
}
|
2017-07-19 00:03:38 +00:00
|
|
|
}
|
|
|
|
Some(help)
|
|
|
|
}
|
|
|
|
|
2020-07-02 12:07:56 +00:00
|
|
|
fn new_internal(build: &Build, kind: Kind, paths: Vec<PathBuf>) -> Builder<'_> {
|
|
|
|
Builder {
|
|
|
|
build,
|
2020-09-12 02:17:16 +00:00
|
|
|
top_stage: build.config.stage,
|
2020-07-02 12:07:56 +00:00
|
|
|
kind,
|
|
|
|
cache: Cache::new(),
|
|
|
|
stack: RefCell::new(Vec::new()),
|
|
|
|
time_spent_on_dependencies: Cell::new(Duration::new(0, 0)),
|
|
|
|
paths,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-02-25 10:30:32 +00:00
|
|
|
pub fn new(build: &Build) -> Builder<'_> {
|
2017-07-30 04:12:53 +00:00
|
|
|
let (kind, paths) = match build.config.cmd {
|
2017-07-05 16:20:20 +00:00
|
|
|
Subcommand::Build { ref paths } => (Kind::Build, &paths[..]),
|
2021-08-13 16:03:17 +00:00
|
|
|
Subcommand::Check { ref paths } => (Kind::Check, &paths[..]),
|
2020-09-30 00:24:14 +00:00
|
|
|
Subcommand::Clippy { ref paths, .. } => (Kind::Clippy, &paths[..]),
|
2018-12-04 18:26:54 +00:00
|
|
|
Subcommand::Fix { ref paths } => (Kind::Fix, &paths[..]),
|
2020-05-22 02:48:44 +00:00
|
|
|
Subcommand::Doc { ref paths, .. } => (Kind::Doc, &paths[..]),
|
2017-07-05 16:20:20 +00:00
|
|
|
Subcommand::Test { ref paths, .. } => (Kind::Test, &paths[..]),
|
|
|
|
Subcommand::Bench { ref paths, .. } => (Kind::Bench, &paths[..]),
|
|
|
|
Subcommand::Dist { ref paths } => (Kind::Dist, &paths[..]),
|
|
|
|
Subcommand::Install { ref paths } => (Kind::Install, &paths[..]),
|
2019-11-26 11:06:30 +00:00
|
|
|
Subcommand::Run { ref paths } => (Kind::Run, &paths[..]),
|
2022-05-29 02:17:28 +00:00
|
|
|
Subcommand::Format { .. } => (Kind::Format, &[][..]),
|
|
|
|
Subcommand::Clean { .. } | Subcommand::Setup { .. } => {
|
2020-09-12 06:32:43 +00:00
|
|
|
panic!()
|
2020-07-27 19:53:01 +00:00
|
|
|
}
|
2017-07-05 16:20:20 +00:00
|
|
|
};
|
2020-07-27 19:53:01 +00:00
|
|
|
|
2020-09-12 02:17:16 +00:00
|
|
|
Self::new_internal(build, kind, paths.to_owned())
|
2018-03-10 02:05:06 +00:00
|
|
|
}
|
|
|
|
|
2019-12-21 15:54:15 +00:00
|
|
|
pub fn execute_cli(&self) {
|
Add tests to rustbuild
In order to run tests, previous commits have cfg'd out various parts of
rustbuild. Generally speaking, these are filesystem-related operations
and process-spawning related parts. Then, rustbuild is run "as normal"
and the various steps that where run are retrieved from the cache and
checked against the expected results.
Note that this means that the current implementation primarily tests
"what" we build, but doesn't actually test that what we build *will*
build. In other words, it doesn't do any form of dependency verification
for any crate. This is possible to implement, but is considered future
work.
This implementation strives to cfg out as little code as possible; it
also does not currently test anywhere near all of rustbuild. The current
tests are also not checked for "correctness," rather, they simply
represent what we do as of this commit, which may be wrong.
Test cases are drawn from the old implementation of rustbuild, though
the expected results may vary.
2018-03-10 14:03:06 +00:00
|
|
|
self.run_step_descriptions(&Builder::get_step_descriptions(self.kind), &self.paths);
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
|
|
|
|
2021-02-14 16:31:35 +00:00
|
|
|
pub fn default_doc(&self, paths: &[PathBuf]) {
|
Add tests to rustbuild
In order to run tests, previous commits have cfg'd out various parts of
rustbuild. Generally speaking, these are filesystem-related operations
and process-spawning related parts. Then, rustbuild is run "as normal"
and the various steps that where run are retrieved from the cache and
checked against the expected results.
Note that this means that the current implementation primarily tests
"what" we build, but doesn't actually test that what we build *will*
build. In other words, it doesn't do any form of dependency verification
for any crate. This is possible to implement, but is considered future
work.
This implementation strives to cfg out as little code as possible; it
also does not currently test anywhere near all of rustbuild. The current
tests are also not checked for "correctness," rather, they simply
represent what we do as of this commit, which may be wrong.
Test cases are drawn from the old implementation of rustbuild, though
the expected results may vary.
2018-03-10 14:03:06 +00:00
|
|
|
self.run_step_descriptions(&Builder::get_step_descriptions(Kind::Doc), paths);
|
|
|
|
}
|
|
|
|
|
2021-05-05 03:36:33 +00:00
|
|
|
/// NOTE: keep this in sync with `rustdoc::clean::utils::doc_rust_lang_org_channel`, or tests will fail on beta/stable.
|
|
|
|
pub fn doc_rust_lang_org_channel(&self) -> String {
|
|
|
|
let channel = match &*self.config.channel {
|
|
|
|
"stable" => &self.version,
|
|
|
|
"beta" => "beta",
|
|
|
|
"nightly" | "dev" => "nightly",
|
|
|
|
// custom build of rustdoc maybe? link to the latest stable docs just in case
|
|
|
|
_ => "stable",
|
|
|
|
};
|
|
|
|
"https://doc.rust-lang.org/".to_owned() + channel
|
|
|
|
}
|
|
|
|
|
Add tests to rustbuild
In order to run tests, previous commits have cfg'd out various parts of
rustbuild. Generally speaking, these are filesystem-related operations
and process-spawning related parts. Then, rustbuild is run "as normal"
and the various steps that where run are retrieved from the cache and
checked against the expected results.
Note that this means that the current implementation primarily tests
"what" we build, but doesn't actually test that what we build *will*
build. In other words, it doesn't do any form of dependency verification
for any crate. This is possible to implement, but is considered future
work.
This implementation strives to cfg out as little code as possible; it
also does not currently test anywhere near all of rustbuild. The current
tests are also not checked for "correctness," rather, they simply
represent what we do as of this commit, which may be wrong.
Test cases are drawn from the old implementation of rustbuild, though
the expected results may vary.
2018-03-10 14:03:06 +00:00
|
|
|
fn run_step_descriptions(&self, v: &[StepDescription], paths: &[PathBuf]) {
|
|
|
|
StepDescription::run(v, self, paths);
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
|
|
|
|
2022-05-03 04:38:25 +00:00
|
|
|
/// Modifies the interpreter section of 'fname' to fix the dynamic linker,
|
|
|
|
/// or the RPATH section, to fix the dynamic library search path
|
|
|
|
///
|
|
|
|
/// This is only required on NixOS and uses the PatchELF utility to
|
|
|
|
/// change the interpreter/RPATH of ELF executables.
|
|
|
|
///
|
|
|
|
/// Please see https://nixos.org/patchelf.html for more information
|
|
|
|
pub(crate) fn fix_bin_or_dylib(&self, fname: &Path) {
|
|
|
|
// FIXME: cache NixOS detection?
|
|
|
|
match Command::new("uname").arg("-s").stderr(Stdio::inherit()).output() {
|
|
|
|
Err(_) => return,
|
|
|
|
Ok(output) if !output.status.success() => return,
|
|
|
|
Ok(output) => {
|
|
|
|
let mut s = output.stdout;
|
|
|
|
if s.last() == Some(&b'\n') {
|
|
|
|
s.pop();
|
|
|
|
}
|
|
|
|
if s != b"Linux" {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// If the user has asked binaries to be patched for Nix, then
|
|
|
|
// don't check for NixOS or `/lib`, just continue to the patching.
|
2022-05-04 15:37:35 +00:00
|
|
|
// NOTE: this intentionally comes after the Linux check:
|
|
|
|
// - patchelf only works with ELF files, so no need to run it on Mac or Windows
|
|
|
|
// - On other Unix systems, there is no stable syscall interface, so Nix doesn't manage the global libc.
|
2022-05-03 04:38:25 +00:00
|
|
|
if !self.config.patch_binaries_for_nix {
|
|
|
|
// Use `/etc/os-release` instead of `/etc/NIXOS`.
|
|
|
|
// The latter one does not exist on NixOS when using tmpfs as root.
|
|
|
|
const NIX_IDS: &[&str] = &["ID=nixos", "ID='nixos'", "ID=\"nixos\""];
|
|
|
|
let os_release = match File::open("/etc/os-release") {
|
|
|
|
Err(e) if e.kind() == ErrorKind::NotFound => return,
|
|
|
|
Err(e) => panic!("failed to access /etc/os-release: {}", e),
|
|
|
|
Ok(f) => f,
|
|
|
|
};
|
|
|
|
if !BufReader::new(os_release).lines().any(|l| NIX_IDS.contains(&t!(l).trim())) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if Path::new("/lib").exists() {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// At this point we're pretty sure the user is running NixOS or using Nix
|
|
|
|
println!("info: you seem to be using Nix. Attempting to patch {}", fname.display());
|
|
|
|
|
|
|
|
// Only build `.nix-deps` once.
|
|
|
|
static NIX_DEPS_DIR: OnceCell<PathBuf> = OnceCell::new();
|
|
|
|
let mut nix_build_succeeded = true;
|
|
|
|
let nix_deps_dir = NIX_DEPS_DIR.get_or_init(|| {
|
|
|
|
// Run `nix-build` to "build" each dependency (which will likely reuse
|
|
|
|
// the existing `/nix/store` copy, or at most download a pre-built copy).
|
|
|
|
//
|
|
|
|
// Importantly, we create a gc-root called `.nix-deps` in the `build/`
|
|
|
|
// directory, but still reference the actual `/nix/store` path in the rpath
|
|
|
|
// as it makes it significantly more robust against changes to the location of
|
|
|
|
// the `.nix-deps` location.
|
|
|
|
//
|
|
|
|
// bintools: Needed for the path of `ld-linux.so` (via `nix-support/dynamic-linker`).
|
|
|
|
// zlib: Needed as a system dependency of `libLLVM-*.so`.
|
|
|
|
// patchelf: Needed for patching ELF binaries (see doc comment above).
|
|
|
|
let nix_deps_dir = self.out.join(".nix-deps");
|
|
|
|
const NIX_EXPR: &str = "
|
|
|
|
with (import <nixpkgs> {});
|
|
|
|
symlinkJoin {
|
|
|
|
name = \"rust-stage0-dependencies\";
|
|
|
|
paths = [
|
|
|
|
zlib
|
|
|
|
patchelf
|
|
|
|
stdenv.cc.bintools
|
|
|
|
];
|
|
|
|
}
|
|
|
|
";
|
|
|
|
nix_build_succeeded = self.try_run(Command::new("nix-build").args(&[
|
|
|
|
Path::new("-E"),
|
|
|
|
Path::new(NIX_EXPR),
|
|
|
|
Path::new("-o"),
|
|
|
|
&nix_deps_dir,
|
|
|
|
]));
|
|
|
|
nix_deps_dir
|
|
|
|
});
|
|
|
|
if !nix_build_succeeded {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
let mut patchelf = Command::new(nix_deps_dir.join("bin/patchelf"));
|
|
|
|
let rpath_entries = {
|
|
|
|
// ORIGIN is a relative default, all binary and dynamic libraries we ship
|
|
|
|
// appear to have this (even when `../lib` is redundant).
|
|
|
|
// NOTE: there are only two paths here, delimited by a `:`
|
|
|
|
let mut entries = OsString::from("$ORIGIN/../lib:");
|
|
|
|
entries.push(t!(fs::canonicalize(nix_deps_dir)));
|
|
|
|
entries.push("/lib");
|
|
|
|
entries
|
|
|
|
};
|
|
|
|
patchelf.args(&[OsString::from("--set-rpath"), rpath_entries]);
|
|
|
|
if !fname.extension().map_or(false, |ext| ext == "so") {
|
|
|
|
// Finally, set the corret .interp for binaries
|
|
|
|
let dynamic_linker_path = nix_deps_dir.join("nix-support/dynamic-linker");
|
|
|
|
// FIXME: can we support utf8 here? `args` doesn't accept Vec<u8>, only OsString ...
|
|
|
|
let dynamic_linker = t!(String::from_utf8(t!(fs::read(dynamic_linker_path))));
|
|
|
|
patchelf.args(&["--set-interpreter", dynamic_linker.trim_end()]);
|
|
|
|
}
|
|
|
|
|
|
|
|
self.try_run(patchelf.arg(fname));
|
|
|
|
}
|
|
|
|
|
2022-06-07 11:15:41 +00:00
|
|
|
pub(crate) fn download_component(&self, url: &str, dest_path: &Path, help_on_error: &str) {
|
2022-07-02 04:47:48 +00:00
|
|
|
self.verbose(&format!("download {url}"));
|
2022-05-03 04:38:25 +00:00
|
|
|
// Use a temporary file in case we crash while downloading, to avoid a corrupt download in cache/.
|
|
|
|
let tempfile = self.tempdir().join(dest_path.file_name().unwrap());
|
2022-06-07 12:50:14 +00:00
|
|
|
// While bootstrap itself only supports http and https downloads, downstream forks might
|
|
|
|
// need to download components from other protocols. The match allows them adding more
|
|
|
|
// protocols without worrying about merge conficts if we change the HTTP implementation.
|
|
|
|
match url.split_once("://").map(|(proto, _)| proto) {
|
|
|
|
Some("http") | Some("https") => {
|
|
|
|
self.download_http_with_retries(&tempfile, url, help_on_error)
|
|
|
|
}
|
|
|
|
Some(other) => panic!("unsupported protocol {other} in {url}"),
|
|
|
|
None => panic!("no protocol in {url}"),
|
|
|
|
}
|
2022-05-03 04:38:25 +00:00
|
|
|
t!(std::fs::rename(&tempfile, dest_path));
|
|
|
|
}
|
|
|
|
|
2022-06-07 12:50:14 +00:00
|
|
|
fn download_http_with_retries(&self, tempfile: &Path, url: &str, help_on_error: &str) {
|
2022-05-03 04:38:25 +00:00
|
|
|
println!("downloading {}", url);
|
|
|
|
// Try curl. If that fails and we are on windows, fallback to PowerShell.
|
2022-05-09 04:03:38 +00:00
|
|
|
let mut curl = Command::new("curl");
|
|
|
|
curl.args(&[
|
2022-05-03 04:38:25 +00:00
|
|
|
"-#",
|
|
|
|
"-y",
|
|
|
|
"30",
|
|
|
|
"-Y",
|
|
|
|
"10", // timeout if speed is < 10 bytes/sec for > 30 seconds
|
|
|
|
"--connect-timeout",
|
|
|
|
"30", // timeout if cannot connect within 30 seconds
|
|
|
|
"--retry",
|
|
|
|
"3",
|
|
|
|
"-Sf",
|
|
|
|
"-o",
|
2022-05-09 04:03:38 +00:00
|
|
|
]);
|
|
|
|
curl.arg(tempfile);
|
|
|
|
curl.arg(url);
|
|
|
|
if !self.check_run(&mut curl) {
|
2022-05-03 04:38:25 +00:00
|
|
|
if self.build.build.contains("windows-msvc") {
|
|
|
|
println!("Fallback to PowerShell");
|
|
|
|
for _ in 0..3 {
|
|
|
|
if self.try_run(Command::new("PowerShell.exe").args(&[
|
|
|
|
"/nologo",
|
|
|
|
"-Command",
|
|
|
|
"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;",
|
|
|
|
&format!(
|
|
|
|
"(New-Object System.Net.WebClient).DownloadFile('{}', '{}')",
|
2022-05-09 04:03:38 +00:00
|
|
|
url, tempfile.to_str().expect("invalid UTF-8 not supported with powershell downloads"),
|
2022-05-03 04:38:25 +00:00
|
|
|
),
|
|
|
|
])) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
println!("\nspurious failure, trying again");
|
|
|
|
}
|
|
|
|
}
|
2022-05-29 14:11:36 +00:00
|
|
|
if !help_on_error.is_empty() {
|
|
|
|
eprintln!("{}", help_on_error);
|
|
|
|
}
|
2022-07-06 06:05:44 +00:00
|
|
|
crate::detail_exit(1);
|
2022-05-03 04:38:25 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-05-03 18:29:37 +00:00
|
|
|
pub(crate) fn unpack(&self, tarball: &Path, dst: &Path, pattern: &str) {
|
2022-05-03 04:38:25 +00:00
|
|
|
println!("extracting {} to {}", tarball.display(), dst.display());
|
|
|
|
if !dst.exists() {
|
|
|
|
t!(fs::create_dir_all(dst));
|
|
|
|
}
|
|
|
|
|
|
|
|
// `tarball` ends with `.tar.xz`; strip that suffix
|
|
|
|
// example: `rust-dev-nightly-x86_64-unknown-linux-gnu`
|
|
|
|
let uncompressed_filename =
|
|
|
|
Path::new(tarball.file_name().expect("missing tarball filename")).file_stem().unwrap();
|
|
|
|
let directory_prefix = Path::new(Path::new(uncompressed_filename).file_stem().unwrap());
|
|
|
|
|
|
|
|
// decompress the file
|
|
|
|
let data = t!(File::open(tarball));
|
|
|
|
let decompressor = XzDecoder::new(BufReader::new(data));
|
|
|
|
|
|
|
|
let mut tar = tar::Archive::new(decompressor);
|
|
|
|
for member in t!(tar.entries()) {
|
|
|
|
let mut member = t!(member);
|
|
|
|
let original_path = t!(member.path()).into_owned();
|
|
|
|
// skip the top-level directory
|
|
|
|
if original_path == directory_prefix {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
let mut short_path = t!(original_path.strip_prefix(directory_prefix));
|
2022-05-03 18:29:37 +00:00
|
|
|
if !short_path.starts_with(pattern) {
|
2022-05-03 04:38:25 +00:00
|
|
|
continue;
|
|
|
|
}
|
2022-05-03 18:29:37 +00:00
|
|
|
short_path = t!(short_path.strip_prefix(pattern));
|
2022-05-03 04:38:25 +00:00
|
|
|
let dst_path = dst.join(short_path);
|
|
|
|
self.verbose(&format!("extracting {} to {}", original_path.display(), dst.display()));
|
|
|
|
if !t!(member.unpack_in(dst)) {
|
|
|
|
panic!("path traversal attack ??");
|
|
|
|
}
|
|
|
|
let src_path = dst.join(original_path);
|
|
|
|
if src_path.is_dir() && dst_path.exists() {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
t!(fs::rename(src_path, dst_path));
|
|
|
|
}
|
|
|
|
t!(fs::remove_dir_all(dst.join(directory_prefix)));
|
|
|
|
}
|
|
|
|
|
2022-05-29 03:05:43 +00:00
|
|
|
/// Returns whether the SHA256 checksum of `path` matches `expected`.
|
|
|
|
pub(crate) fn verify(&self, path: &Path, expected: &str) -> bool {
|
|
|
|
use sha2::Digest;
|
|
|
|
|
|
|
|
self.verbose(&format!("verifying {}", path.display()));
|
|
|
|
let mut hasher = sha2::Sha256::new();
|
|
|
|
// FIXME: this is ok for rustfmt (4.1 MB large at time of writing), but it seems memory-intensive for rustc and larger components.
|
|
|
|
// Consider using streaming IO instead?
|
|
|
|
let contents = if self.config.dry_run { vec![] } else { t!(fs::read(path)) };
|
|
|
|
hasher.update(&contents);
|
|
|
|
let found = hex::encode(hasher.finalize().as_slice());
|
|
|
|
let verified = found == expected;
|
|
|
|
if !verified && !self.config.dry_run {
|
|
|
|
println!(
|
|
|
|
"invalid checksum: \n\
|
|
|
|
found: {found}\n\
|
|
|
|
expected: {expected}",
|
|
|
|
);
|
|
|
|
}
|
|
|
|
return verified;
|
|
|
|
}
|
|
|
|
|
2017-08-11 18:34:14 +00:00
|
|
|
/// Obtain a compiler at a given stage and for a given host. Explicitly does
|
2017-07-07 17:17:37 +00:00
|
|
|
/// not take `Compiler` since all `Compiler` instances are meant to be
|
|
|
|
/// obtained through this function, since it ensures that they are valid
|
|
|
|
/// (i.e., built and assembled).
|
2020-07-17 14:08:04 +00:00
|
|
|
pub fn compiler(&self, stage: u32, host: TargetSelection) -> Compiler {
|
2018-05-30 17:33:43 +00:00
|
|
|
self.ensure(compile::Assemble { target_compiler: Compiler { stage, host } })
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
|
|
|
|
2019-05-28 17:00:53 +00:00
|
|
|
/// Similar to `compiler`, except handles the full-bootstrap option to
|
|
|
|
/// silently use the stage1 compiler instead of a stage2 compiler if one is
|
|
|
|
/// requested.
|
|
|
|
///
|
|
|
|
/// Note that this does *not* have the side effect of creating
|
|
|
|
/// `compiler(stage, host)`, unlike `compiler` above which does have such
|
|
|
|
/// a side effect. The returned compiler here can only be used to compile
|
|
|
|
/// new artifacts, it can't be used to rely on the presence of a particular
|
|
|
|
/// sysroot.
|
|
|
|
///
|
|
|
|
/// See `force_use_stage1` for documentation on what each argument is.
|
2019-05-28 18:56:05 +00:00
|
|
|
pub fn compiler_for(
|
|
|
|
&self,
|
|
|
|
stage: u32,
|
2020-07-17 14:08:04 +00:00
|
|
|
host: TargetSelection,
|
|
|
|
target: TargetSelection,
|
2019-05-28 18:56:05 +00:00
|
|
|
) -> Compiler {
|
2019-05-28 17:00:53 +00:00
|
|
|
if self.build.force_use_stage1(Compiler { stage, host }, target) {
|
|
|
|
self.compiler(1, self.config.build)
|
|
|
|
} else {
|
|
|
|
self.compiler(stage, host)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-14 00:48:44 +00:00
|
|
|
pub fn sysroot(&self, compiler: Compiler) -> Interned<PathBuf> {
|
2017-07-05 16:20:20 +00:00
|
|
|
self.ensure(compile::Sysroot { compiler })
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns the libdir where the standard library and other artifacts are
|
|
|
|
/// found for a compiler's sysroot.
|
2020-07-17 14:08:04 +00:00
|
|
|
pub fn sysroot_libdir(&self, compiler: Compiler, target: TargetSelection) -> Interned<PathBuf> {
|
2017-07-14 00:48:44 +00:00
|
|
|
#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
|
|
|
|
struct Libdir {
|
|
|
|
compiler: Compiler,
|
2020-07-17 14:08:04 +00:00
|
|
|
target: TargetSelection,
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
2017-07-14 00:48:44 +00:00
|
|
|
impl Step for Libdir {
|
|
|
|
type Output = Interned<PathBuf>;
|
2017-07-14 12:30:16 +00:00
|
|
|
|
2019-02-25 10:30:32 +00:00
|
|
|
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
|
2017-07-19 00:03:38 +00:00
|
|
|
run.never()
|
2017-07-14 12:30:16 +00:00
|
|
|
}
|
|
|
|
|
2019-02-25 10:30:32 +00:00
|
|
|
fn run(self, builder: &Builder<'_>) -> Interned<PathBuf> {
|
2019-08-07 20:37:55 +00:00
|
|
|
let lib = builder.sysroot_libdir_relative(self.compiler);
|
2018-05-30 17:33:43 +00:00
|
|
|
let sysroot = builder
|
|
|
|
.sysroot(self.compiler)
|
|
|
|
.join(lib)
|
|
|
|
.join("rustlib")
|
2020-07-17 14:08:04 +00:00
|
|
|
.join(self.target.triple)
|
2018-05-30 17:33:43 +00:00
|
|
|
.join("lib");
|
2021-01-22 05:31:17 +00:00
|
|
|
// Avoid deleting the rustlib/ directory we just copied
|
|
|
|
// (in `impl Step for Sysroot`).
|
2022-05-03 18:29:37 +00:00
|
|
|
if !builder.download_rustc() {
|
2021-01-22 05:31:17 +00:00
|
|
|
let _ = fs::remove_dir_all(&sysroot);
|
|
|
|
t!(fs::create_dir_all(&sysroot));
|
|
|
|
}
|
2017-07-14 00:48:44 +00:00
|
|
|
INTERNER.intern_path(sysroot)
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
self.ensure(Libdir { compiler, target })
|
|
|
|
}
|
|
|
|
|
2020-10-15 12:23:43 +00:00
|
|
|
pub fn sysroot_codegen_backends(&self, compiler: Compiler) -> PathBuf {
|
|
|
|
self.sysroot_libdir(compiler, compiler.host).with_file_name("codegen-backends")
|
|
|
|
}
|
|
|
|
|
2017-07-05 16:20:20 +00:00
|
|
|
/// Returns the compiler's libdir where it stores the dynamic libraries that
|
|
|
|
/// it itself links against.
|
|
|
|
///
|
|
|
|
/// For example this returns `<sysroot>/lib` on Unix and `<sysroot>/bin` on
|
|
|
|
/// Windows.
|
|
|
|
pub fn rustc_libdir(&self, compiler: Compiler) -> PathBuf {
|
|
|
|
if compiler.is_snapshot(self) {
|
2018-04-14 23:27:57 +00:00
|
|
|
self.rustc_snapshot_libdir()
|
2017-07-05 16:20:20 +00:00
|
|
|
} else {
|
2019-03-31 19:28:12 +00:00
|
|
|
match self.config.libdir_relative() {
|
|
|
|
Some(relative_libdir) if compiler.stage >= 1 => {
|
|
|
|
self.sysroot(compiler).join(relative_libdir)
|
2019-12-22 22:42:04 +00:00
|
|
|
}
|
2020-07-17 14:08:04 +00:00
|
|
|
_ => self.sysroot(compiler).join(libdir(compiler.host)),
|
2019-03-31 19:28:12 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns the compiler's relative libdir where it stores the dynamic libraries that
|
|
|
|
/// it itself links against.
|
|
|
|
///
|
|
|
|
/// For example this returns `lib` on Unix and `bin` on
|
|
|
|
/// Windows.
|
|
|
|
pub fn libdir_relative(&self, compiler: Compiler) -> &Path {
|
|
|
|
if compiler.is_snapshot(self) {
|
2020-07-17 14:08:04 +00:00
|
|
|
libdir(self.config.build).as_ref()
|
2019-03-31 19:28:12 +00:00
|
|
|
} else {
|
|
|
|
match self.config.libdir_relative() {
|
|
|
|
Some(relative_libdir) if compiler.stage >= 1 => relative_libdir,
|
2020-07-17 14:08:04 +00:00
|
|
|
_ => libdir(compiler.host).as_ref(),
|
2019-03-31 19:28:12 +00:00
|
|
|
}
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-08-07 20:37:55 +00:00
|
|
|
/// Returns the compiler's relative libdir where the standard library and other artifacts are
|
|
|
|
/// found for a compiler's sysroot.
|
|
|
|
///
|
|
|
|
/// For example this returns `lib` on Unix and Windows.
|
|
|
|
pub fn sysroot_libdir_relative(&self, compiler: Compiler) -> &Path {
|
|
|
|
match self.config.libdir_relative() {
|
|
|
|
Some(relative_libdir) if compiler.stage >= 1 => relative_libdir,
|
2020-05-29 07:15:46 +00:00
|
|
|
_ if compiler.stage == 0 => &self.build.initial_libdir,
|
2019-08-07 20:37:55 +00:00
|
|
|
_ => Path::new("lib"),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-03-27 22:04:21 +00:00
|
|
|
pub fn rustc_lib_paths(&self, compiler: Compiler) -> Vec<PathBuf> {
|
|
|
|
let mut dylib_dirs = vec![self.rustc_libdir(compiler)];
|
|
|
|
|
|
|
|
// Ensure that the downloaded LLVM libraries can be found.
|
|
|
|
if self.config.llvm_from_ci {
|
|
|
|
let ci_llvm_lib = self.out.join(&*compiler.host.triple).join("ci-llvm").join("lib");
|
|
|
|
dylib_dirs.push(ci_llvm_lib);
|
|
|
|
}
|
|
|
|
|
|
|
|
dylib_dirs
|
|
|
|
}
|
|
|
|
|
2017-07-05 16:20:20 +00:00
|
|
|
/// Adds the compiler's directory of dynamic libraries to `cmd`'s dynamic
|
|
|
|
/// library lookup path.
|
2020-09-14 21:42:56 +00:00
|
|
|
pub fn add_rustc_lib_path(&self, compiler: Compiler, cmd: &mut Command) {
|
2017-07-05 16:20:20 +00:00
|
|
|
// Windows doesn't need dylib path munging because the dlls for the
|
|
|
|
// compiler live next to the compiler and the system will find them
|
|
|
|
// automatically.
|
|
|
|
if cfg!(windows) {
|
2018-05-30 17:33:43 +00:00
|
|
|
return;
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
|
|
|
|
2022-03-27 22:04:21 +00:00
|
|
|
add_dylib_path(self.rustc_lib_paths(compiler), cmd);
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
|
|
|
|
2019-02-08 13:53:55 +00:00
|
|
|
/// Gets a path to the compiler specified.
|
2017-07-05 17:21:33 +00:00
|
|
|
pub fn rustc(&self, compiler: Compiler) -> PathBuf {
|
|
|
|
if compiler.is_snapshot(self) {
|
|
|
|
self.initial_rustc.clone()
|
|
|
|
} else {
|
2020-07-17 14:08:04 +00:00
|
|
|
self.sysroot(compiler).join("bin").join(exe("rustc", compiler.host))
|
2017-07-05 17:21:33 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-10-15 12:23:43 +00:00
|
|
|
/// Gets the paths to all of the compiler's codegen backends.
|
|
|
|
fn codegen_backends(&self, compiler: Compiler) -> impl Iterator<Item = PathBuf> {
|
|
|
|
fs::read_dir(self.sysroot_codegen_backends(compiler))
|
|
|
|
.into_iter()
|
|
|
|
.flatten()
|
|
|
|
.filter_map(Result::ok)
|
|
|
|
.map(|entry| entry.path())
|
|
|
|
}
|
|
|
|
|
2019-03-03 16:50:56 +00:00
|
|
|
pub fn rustdoc(&self, compiler: Compiler) -> PathBuf {
|
|
|
|
self.ensure(tool::Rustdoc { compiler })
|
2017-07-23 02:01:58 +00:00
|
|
|
}
|
|
|
|
|
2019-03-03 16:50:56 +00:00
|
|
|
pub fn rustdoc_cmd(&self, compiler: Compiler) -> Command {
|
2022-03-03 12:12:32 +00:00
|
|
|
let mut cmd = Command::new(&self.bootstrap_out.join("rustdoc"));
|
2017-12-06 08:25:29 +00:00
|
|
|
cmd.env("RUSTC_STAGE", compiler.stage.to_string())
|
2018-05-30 17:33:43 +00:00
|
|
|
.env("RUSTC_SYSROOT", self.sysroot(compiler))
|
2019-02-07 15:20:17 +00:00
|
|
|
// Note that this is *not* the sysroot_libdir because rustdoc must be linked
|
|
|
|
// equivalently to rustc.
|
|
|
|
.env("RUSTDOC_LIBDIR", self.rustc_libdir(compiler))
|
2018-05-30 17:33:43 +00:00
|
|
|
.env("CFG_RELEASE_CHANNEL", &self.config.channel)
|
2019-03-03 16:50:56 +00:00
|
|
|
.env("RUSTDOC_REAL", self.rustdoc(compiler))
|
2020-12-30 04:16:16 +00:00
|
|
|
.env("RUSTC_BOOTSTRAP", "1");
|
|
|
|
|
2021-03-26 20:10:21 +00:00
|
|
|
cmd.arg("-Wrustdoc::invalid_codeblock_attributes");
|
2020-12-30 04:16:16 +00:00
|
|
|
|
2020-07-13 14:29:12 +00:00
|
|
|
if self.config.deny_warnings {
|
|
|
|
cmd.arg("-Dwarnings");
|
|
|
|
}
|
2020-12-30 13:04:59 +00:00
|
|
|
cmd.arg("-Znormalize-docs");
|
2018-12-12 05:28:43 +00:00
|
|
|
|
|
|
|
// Remove make-related flags that can cause jobserver problems.
|
|
|
|
cmd.env_remove("MAKEFLAGS");
|
|
|
|
cmd.env_remove("MFLAGS");
|
|
|
|
|
2020-09-04 17:54:07 +00:00
|
|
|
if let Some(linker) = self.linker(compiler.host) {
|
2020-09-06 19:07:14 +00:00
|
|
|
cmd.env("RUSTDOC_LINKER", linker);
|
|
|
|
}
|
2020-09-06 21:39:58 +00:00
|
|
|
if self.is_fuse_ld_lld(compiler.host) {
|
2020-09-06 19:07:14 +00:00
|
|
|
cmd.env("RUSTDOC_FUSE_LD_LLD", "1");
|
2017-12-06 08:25:29 +00:00
|
|
|
}
|
2017-07-23 02:01:58 +00:00
|
|
|
cmd
|
2017-07-05 17:21:33 +00:00
|
|
|
}
|
|
|
|
|
2020-03-19 17:28:47 +00:00
|
|
|
/// Return the path to `llvm-config` for the target, if it exists.
|
|
|
|
///
|
|
|
|
/// Note that this returns `None` if LLVM is disabled, or if we're in a
|
|
|
|
/// check build or dry-run, where there's no need to build all of LLVM.
|
2020-07-17 14:08:04 +00:00
|
|
|
fn llvm_config(&self, target: TargetSelection) -> Option<PathBuf> {
|
2020-03-19 17:28:47 +00:00
|
|
|
if self.config.llvm_enabled() && self.kind != Kind::Check && !self.config.dry_run {
|
|
|
|
let llvm_config = self.ensure(native::Llvm { target });
|
|
|
|
if llvm_config.is_file() {
|
|
|
|
return Some(llvm_config);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
None
|
|
|
|
}
|
|
|
|
|
2022-03-21 13:59:34 +00:00
|
|
|
/// Convenience wrapper to allow `builder.llvm_link_shared()` instead of `builder.config.llvm_link_shared(&builder)`.
|
|
|
|
pub(crate) fn llvm_link_shared(&self) -> bool {
|
|
|
|
Config::llvm_link_shared(self)
|
|
|
|
}
|
|
|
|
|
2022-05-03 18:29:37 +00:00
|
|
|
pub(crate) fn download_rustc(&self) -> bool {
|
|
|
|
Config::download_rustc(self)
|
|
|
|
}
|
|
|
|
|
2022-05-29 02:17:28 +00:00
|
|
|
pub(crate) fn initial_rustfmt(&self) -> Option<PathBuf> {
|
|
|
|
Config::initial_rustfmt(self)
|
|
|
|
}
|
|
|
|
|
2017-07-05 16:20:20 +00:00
|
|
|
/// Prepares an invocation of `cargo` to be run.
|
|
|
|
///
|
|
|
|
/// This will create a `Command` that represents a pending execution of
|
|
|
|
/// Cargo. This cargo will be configured to use `compiler` as the actual
|
|
|
|
/// rustc compiler, its output will be scoped by `mode`'s output directory,
|
|
|
|
/// it will pass the `--target` flag for the specified `target`, and will be
|
|
|
|
/// executing the Cargo command `cmd`.
|
2018-05-30 17:33:43 +00:00
|
|
|
pub fn cargo(
|
|
|
|
&self,
|
|
|
|
compiler: Compiler,
|
|
|
|
mode: Mode,
|
2020-06-12 22:44:56 +00:00
|
|
|
source_type: SourceType,
|
2020-07-17 14:08:04 +00:00
|
|
|
target: TargetSelection,
|
2018-05-30 17:33:43 +00:00
|
|
|
cmd: &str,
|
2019-09-09 17:17:38 +00:00
|
|
|
) -> Cargo {
|
2017-07-05 17:14:54 +00:00
|
|
|
let mut cargo = Command::new(&self.initial_cargo);
|
|
|
|
let out_dir = self.stage_out(compiler, mode);
|
2018-07-03 18:59:32 +00:00
|
|
|
|
2020-10-15 12:23:43 +00:00
|
|
|
// Codegen backends are not yet tracked by -Zbinary-dep-depinfo,
|
|
|
|
// so we need to explicitly clear out if they've been updated.
|
|
|
|
for backend in self.codegen_backends(compiler) {
|
|
|
|
self.clear_if_dirty(&out_dir, &backend);
|
|
|
|
}
|
|
|
|
|
2018-09-29 14:40:37 +00:00
|
|
|
if cmd == "doc" || cmd == "rustdoc" {
|
2019-08-11 17:00:32 +00:00
|
|
|
let my_out = match mode {
|
2018-07-03 18:59:32 +00:00
|
|
|
// This is the intended out directory for compiler documentation.
|
2020-09-05 17:33:00 +00:00
|
|
|
Mode::Rustc | Mode::ToolRustc => self.compiler_doc_out(target),
|
2020-07-17 14:08:04 +00:00
|
|
|
Mode::Std => out_dir.join(target.triple).join("doc"),
|
2020-07-15 04:18:41 +00:00
|
|
|
_ => panic!("doc mode {:?} not expected", mode),
|
2019-08-11 17:00:32 +00:00
|
|
|
};
|
2019-03-03 16:50:56 +00:00
|
|
|
let rustdoc = self.rustdoc(compiler);
|
2018-07-03 18:59:32 +00:00
|
|
|
self.clear_if_dirty(&my_out, &rustdoc);
|
|
|
|
}
|
|
|
|
|
2020-03-15 18:43:25 +00:00
|
|
|
cargo.env("CARGO_TARGET_DIR", &out_dir).arg(cmd);
|
2019-09-09 16:42:56 +00:00
|
|
|
|
|
|
|
let profile_var = |name: &str| {
|
|
|
|
let profile = if self.config.rust_optimize { "RELEASE" } else { "DEV" };
|
|
|
|
format!("CARGO_PROFILE_{}_{}", profile, name)
|
|
|
|
};
|
2018-05-25 12:04:27 +00:00
|
|
|
|
2020-07-26 17:11:30 +00:00
|
|
|
// See comment in rustc_llvm/build.rs for why this is necessary, largely llvm-config
|
2019-01-22 00:47:57 +00:00
|
|
|
// needs to not accidentally link to libLLVM in stage0/lib.
|
|
|
|
cargo.env("REAL_LIBRARY_PATH_VAR", &util::dylib_path_var());
|
|
|
|
if let Some(e) = env::var_os(util::dylib_path_var()) {
|
|
|
|
cargo.env("REAL_LIBRARY_PATH", e);
|
|
|
|
}
|
|
|
|
|
2021-01-11 04:01:49 +00:00
|
|
|
// Found with `rg "init_env_logger\("`. If anyone uses `init_env_logger`
|
|
|
|
// from out of tree it shouldn't matter, since x.py is only used for
|
|
|
|
// building in-tree.
|
|
|
|
let color_logs = ["RUSTDOC_LOG_COLOR", "RUSTC_LOG_COLOR", "RUST_LOG_COLOR"];
|
2020-11-12 21:23:35 +00:00
|
|
|
match self.build.config.color {
|
|
|
|
Color::Always => {
|
|
|
|
cargo.arg("--color=always");
|
2021-01-11 04:01:49 +00:00
|
|
|
for log in &color_logs {
|
|
|
|
cargo.env(log, "always");
|
|
|
|
}
|
2020-11-12 21:23:35 +00:00
|
|
|
}
|
|
|
|
Color::Never => {
|
|
|
|
cargo.arg("--color=never");
|
2021-01-11 04:01:49 +00:00
|
|
|
for log in &color_logs {
|
|
|
|
cargo.env(log, "never");
|
|
|
|
}
|
2020-11-12 21:23:35 +00:00
|
|
|
}
|
|
|
|
Color::Auto => {} // nothing to do
|
|
|
|
}
|
|
|
|
|
2018-05-25 12:04:27 +00:00
|
|
|
if cmd != "install" {
|
2020-07-17 14:08:04 +00:00
|
|
|
cargo.arg("--target").arg(target.rustc_target_arg());
|
2018-05-25 12:04:27 +00:00
|
|
|
} else {
|
|
|
|
assert_eq!(target, compiler.host);
|
|
|
|
}
|
2017-07-05 16:20:20 +00:00
|
|
|
|
2018-12-04 18:26:54 +00:00
|
|
|
// Set a flag for `check`/`clippy`/`fix`, so that certain build
|
2020-05-02 22:39:33 +00:00
|
|
|
// scripts can do less work (i.e. not building/requiring LLVM).
|
2018-12-04 18:26:54 +00:00
|
|
|
if cmd == "check" || cmd == "clippy" || cmd == "fix" {
|
2020-05-02 22:39:33 +00:00
|
|
|
// If we've not yet built LLVM, or it's stale, then bust
|
2020-07-26 17:11:30 +00:00
|
|
|
// the rustc_llvm cache. That will always work, even though it
|
2020-05-02 22:39:33 +00:00
|
|
|
// may mean that on the next non-check build we'll need to rebuild
|
2020-07-26 17:11:30 +00:00
|
|
|
// rustc_llvm. But if LLVM is stale, that'll be a tiny amount
|
2022-03-16 12:12:30 +00:00
|
|
|
// of work comparatively, and we'd likely need to rebuild it anyway,
|
2020-05-02 22:39:33 +00:00
|
|
|
// so that's okay.
|
|
|
|
if crate::native::prebuilt_llvm_config(self, target).is_err() {
|
|
|
|
cargo.env("RUST_CHECK", "1");
|
|
|
|
}
|
2018-04-17 23:50:41 +00:00
|
|
|
}
|
|
|
|
|
2020-02-03 19:13:30 +00:00
|
|
|
let stage = if compiler.stage == 0 && self.local_rebuild {
|
2019-08-15 20:54:36 +00:00
|
|
|
// Assume the local-rebuild rustc already has stage1 features.
|
2020-02-03 19:13:30 +00:00
|
|
|
1
|
2019-08-15 20:54:36 +00:00
|
|
|
} else {
|
2020-02-03 19:13:30 +00:00
|
|
|
compiler.stage
|
|
|
|
};
|
2019-08-15 20:54:36 +00:00
|
|
|
|
2020-07-17 14:08:04 +00:00
|
|
|
let mut rustflags = Rustflags::new(target);
|
2019-08-15 20:54:36 +00:00
|
|
|
if stage != 0 {
|
2019-10-09 15:45:19 +00:00
|
|
|
if let Ok(s) = env::var("CARGOFLAGS_NOT_BOOTSTRAP") {
|
|
|
|
cargo.args(s.split_whitespace());
|
|
|
|
}
|
2019-08-15 20:54:36 +00:00
|
|
|
rustflags.env("RUSTFLAGS_NOT_BOOTSTRAP");
|
|
|
|
} else {
|
2019-10-09 15:45:19 +00:00
|
|
|
if let Ok(s) = env::var("CARGOFLAGS_BOOTSTRAP") {
|
|
|
|
cargo.args(s.split_whitespace());
|
|
|
|
}
|
2019-08-15 20:54:36 +00:00
|
|
|
rustflags.env("RUSTFLAGS_BOOTSTRAP");
|
2020-09-29 23:46:32 +00:00
|
|
|
if cmd == "clippy" {
|
2020-10-27 01:18:28 +00:00
|
|
|
// clippy overwrites sysroot if we pass it to cargo.
|
|
|
|
// Pass it directly to clippy instead.
|
2020-09-29 23:46:32 +00:00
|
|
|
// NOTE: this can't be fixed in clippy because we explicitly don't set `RUSTC`,
|
|
|
|
// so it has no way of knowing the sysroot.
|
|
|
|
rustflags.arg("--sysroot");
|
|
|
|
rustflags.arg(
|
|
|
|
self.sysroot(compiler)
|
|
|
|
.as_os_str()
|
|
|
|
.to_str()
|
|
|
|
.expect("sysroot must be valid UTF-8"),
|
|
|
|
);
|
|
|
|
// Only run clippy on a very limited subset of crates (in particular, not build scripts).
|
|
|
|
cargo.arg("-Zunstable-options");
|
|
|
|
// Explicitly does *not* set `--cfg=bootstrap`, since we're using a nightly clippy.
|
|
|
|
let host_version = Command::new("rustc").arg("--version").output().map_err(|_| ());
|
2020-10-10 05:11:01 +00:00
|
|
|
let output = host_version.and_then(|output| {
|
2020-10-27 01:18:28 +00:00
|
|
|
if output.status.success() {
|
2020-09-29 23:46:32 +00:00
|
|
|
Ok(output)
|
|
|
|
} else {
|
|
|
|
Err(())
|
|
|
|
}
|
2020-10-10 05:11:01 +00:00
|
|
|
}).unwrap_or_else(|_| {
|
2020-09-29 23:46:32 +00:00
|
|
|
eprintln!(
|
2020-10-10 05:11:01 +00:00
|
|
|
"error: `x.py clippy` requires a host `rustc` toolchain with the `clippy` component"
|
2020-09-29 23:46:32 +00:00
|
|
|
);
|
2020-10-10 05:11:01 +00:00
|
|
|
eprintln!("help: try `rustup component add clippy`");
|
2022-07-06 06:05:44 +00:00
|
|
|
crate::detail_exit(1);
|
2020-10-10 05:11:01 +00:00
|
|
|
});
|
|
|
|
if !t!(std::str::from_utf8(&output.stdout)).contains("nightly") {
|
|
|
|
rustflags.arg("--cfg=bootstrap");
|
2020-09-29 23:46:32 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
rustflags.arg("--cfg=bootstrap");
|
|
|
|
}
|
2019-08-15 20:54:36 +00:00
|
|
|
}
|
|
|
|
|
2021-10-19 12:58:21 +00:00
|
|
|
let use_new_symbol_mangling = match self.config.rust_new_symbol_mangling {
|
|
|
|
Some(setting) => {
|
|
|
|
// If an explicit setting is given, use that
|
|
|
|
setting
|
|
|
|
}
|
|
|
|
None => {
|
|
|
|
if mode == Mode::Std {
|
|
|
|
// The standard library defaults to the legacy scheme
|
|
|
|
false
|
|
|
|
} else {
|
|
|
|
// The compiler and tools default to the new scheme
|
|
|
|
true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2022-01-14 08:50:49 +00:00
|
|
|
if use_new_symbol_mangling {
|
|
|
|
rustflags.arg("-Csymbol-mangling-version=v0");
|
2021-10-19 12:58:21 +00:00
|
|
|
} else {
|
2022-01-14 08:50:49 +00:00
|
|
|
rustflags.arg("-Csymbol-mangling-version=legacy");
|
|
|
|
rustflags.arg("-Zunstable-options");
|
2020-08-12 22:42:42 +00:00
|
|
|
}
|
|
|
|
|
2022-07-03 13:14:22 +00:00
|
|
|
// Enable cfg checking of cargo features for everything but std and also enable cfg
|
|
|
|
// checking of names and values.
|
|
|
|
//
|
|
|
|
// Note: `std`, `alloc` and `core` imports some dependencies by #[path] (like
|
|
|
|
// backtrace, core_simd, std_float, ...), those dependencies have their own
|
|
|
|
// features but cargo isn't involved in the #[path] process and so cannot pass the
|
|
|
|
// complete list of features, so for that reason we don't enable checking of
|
|
|
|
// features for std crates.
|
|
|
|
cargo.arg(if mode != Mode::Std {
|
|
|
|
"-Zcheck-cfg=names,values,output,features"
|
|
|
|
} else {
|
|
|
|
"-Zcheck-cfg=names,values,output"
|
|
|
|
});
|
2022-05-28 07:36:41 +00:00
|
|
|
|
2022-07-03 13:14:22 +00:00
|
|
|
// Add extra cfg not defined in/by rustc
|
|
|
|
//
|
|
|
|
// Note: Altrough it would seems that "-Zunstable-options" to `rustflags` is useless as
|
|
|
|
// cargo would implicitly add it, it was discover that sometimes bootstrap only use
|
|
|
|
// `rustflags` without `cargo` making it required.
|
|
|
|
rustflags.arg("-Zunstable-options");
|
|
|
|
for (restricted_mode, name, values) in EXTRA_CHECK_CFGS {
|
|
|
|
if *restricted_mode == None || *restricted_mode == Some(mode) {
|
|
|
|
// Creating a string of the values by concatenating each value:
|
|
|
|
// ',"tvos","watchos"' or '' (nothing) when there are no values
|
|
|
|
let values = match values {
|
|
|
|
Some(values) => values
|
|
|
|
.iter()
|
|
|
|
.map(|val| [",", "\"", val, "\""])
|
|
|
|
.flatten()
|
|
|
|
.collect::<String>(),
|
|
|
|
None => String::new(),
|
|
|
|
};
|
|
|
|
rustflags.arg(&format!("--check-cfg=values({name}{values})"));
|
2022-02-23 17:27:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-04-23 18:24:28 +00:00
|
|
|
// FIXME: It might be better to use the same value for both `RUSTFLAGS` and `RUSTDOCFLAGS`,
|
|
|
|
// but this breaks CI. At the very least, stage0 `rustdoc` needs `--cfg bootstrap`. See
|
|
|
|
// #71458.
|
2020-04-29 13:08:03 +00:00
|
|
|
let mut rustdocflags = rustflags.clone();
|
2021-02-20 01:11:09 +00:00
|
|
|
rustdocflags.propagate_cargo_env("RUSTDOCFLAGS");
|
|
|
|
if stage == 0 {
|
|
|
|
rustdocflags.env("RUSTDOCFLAGS_BOOTSTRAP");
|
|
|
|
} else {
|
|
|
|
rustdocflags.env("RUSTDOCFLAGS_NOT_BOOTSTRAP");
|
|
|
|
}
|
2020-04-23 18:24:28 +00:00
|
|
|
|
2019-10-09 15:45:19 +00:00
|
|
|
if let Ok(s) = env::var("CARGOFLAGS") {
|
|
|
|
cargo.args(s.split_whitespace());
|
|
|
|
}
|
|
|
|
|
2018-12-02 20:47:41 +00:00
|
|
|
match mode {
|
bootstrap: Merge the libtest build step with libstd
Since its inception rustbuild has always worked in three stages: one for
libstd, one for libtest, and one for rustc. These three stages were
architected around crates.io dependencies, where rustc wants to depend
on crates.io crates but said crates don't explicitly depend on libstd,
requiring a sysroot assembly step in the middle. This same logic was
applied for libtest where libtest wants to depend on crates.io crates
(`getopts`) but `getopts` didn't say that it depended on std, so it
needed `std` built ahead of time.
Lots of time has passed since the inception of rustbuild, however,
and we've since gotten to the point where even `std` itself is depending
on crates.io crates (albeit with some wonky configuration). This
commit applies the same logic to the two dependencies that the `test`
crate pulls in from crates.io, `getopts` and `unicode-width`. Over the
many years since rustbuild's inception `unicode-width` was the only
dependency picked up by the `test` crate, so the extra configuration
necessary to get crates building in this crate graph is unlikely to be
too much of a burden on developers.
After this patch it means that there are now only two build phasese of
rustbuild, one for libstd and one for rustc. The libtest/libproc_macro
build phase is all lumped into one now with `std`.
This was originally motivated by rust-lang/cargo#7216 where Cargo was
having to deal with synthesizing dependency edges but this commit makes
them explicit in this repository.
2019-08-16 15:29:08 +00:00
|
|
|
Mode::Std | Mode::ToolBootstrap | Mode::ToolStd => {}
|
2020-10-15 12:23:43 +00:00
|
|
|
Mode::Rustc | Mode::Codegen | Mode::ToolRustc => {
|
2018-12-02 20:47:41 +00:00
|
|
|
// Build proc macros both for the host and the target
|
|
|
|
if target != compiler.host && cmd != "check" {
|
|
|
|
cargo.arg("-Zdual-proc-macros");
|
2019-08-15 20:46:54 +00:00
|
|
|
rustflags.arg("-Zdual-proc-macros");
|
2018-12-02 20:47:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-08-11 17:00:32 +00:00
|
|
|
// This tells Cargo (and in turn, rustc) to output more complete
|
|
|
|
// dependency information. Most importantly for rustbuild, this
|
|
|
|
// includes sysroot artifacts, like libstd, which means that we don't
|
|
|
|
// need to track those in rustbuild (an error prone process!). This
|
|
|
|
// feature is currently unstable as there may be some bugs and such, but
|
|
|
|
// it represents a big improvement in rustbuild's reliability on
|
|
|
|
// rebuilds, so we're using it here.
|
|
|
|
//
|
|
|
|
// For some additional context, see #63470 (the PR originally adding
|
|
|
|
// this), as well as #63012 which is the tracking issue for this
|
|
|
|
// feature on the rustc side.
|
|
|
|
cargo.arg("-Zbinary-dep-depinfo");
|
2022-05-22 14:44:23 +00:00
|
|
|
match mode {
|
|
|
|
Mode::ToolBootstrap => {
|
|
|
|
// Restrict the allowed features to those passed by rustbuild, so we don't depend on nightly accidentally.
|
|
|
|
// HACK: because anyhow does feature detection in build.rs, we need to allow the backtrace feature too.
|
|
|
|
rustflags.arg("-Zallow-features=binary-dep-depinfo,backtrace");
|
|
|
|
}
|
2022-05-25 23:43:09 +00:00
|
|
|
Mode::ToolStd => {
|
|
|
|
// Right now this is just compiletest and a few other tools that build on stable.
|
|
|
|
// Allow them to use `feature(test)`, but nothing else.
|
2022-07-22 13:38:45 +00:00
|
|
|
rustflags.arg("-Zallow-features=binary-dep-depinfo,test,backtrace,proc_macro_internals,proc_macro_diagnostic,proc_macro_span");
|
2022-05-25 23:43:09 +00:00
|
|
|
}
|
|
|
|
Mode::Std | Mode::Rustc | Mode::Codegen | Mode::ToolRustc => {}
|
2022-05-22 14:44:23 +00:00
|
|
|
}
|
2019-08-11 17:00:32 +00:00
|
|
|
|
2018-05-16 23:04:12 +00:00
|
|
|
cargo.arg("-j").arg(self.jobs().to_string());
|
|
|
|
// Remove make-related flags to ensure Cargo can correctly set things up
|
|
|
|
cargo.env_remove("MAKEFLAGS");
|
|
|
|
cargo.env_remove("MFLAGS");
|
2017-09-15 16:40:35 +00:00
|
|
|
|
2017-07-05 16:20:20 +00:00
|
|
|
// FIXME: Temporary fix for https://github.com/rust-lang/cargo/issues/3005
|
|
|
|
// Force cargo to output binaries with disambiguating hashes in the name
|
2019-04-30 19:37:05 +00:00
|
|
|
let mut metadata = if compiler.stage == 0 {
|
|
|
|
// Treat stage0 like a special channel, whether it's a normal prior-
|
2018-05-16 00:48:02 +00:00
|
|
|
// release rustc or a local rebuild with the same version, so we
|
|
|
|
// never mix these libraries by accident.
|
2019-04-30 19:37:05 +00:00
|
|
|
"bootstrap".to_string()
|
2018-05-16 00:48:02 +00:00
|
|
|
} else {
|
2019-04-30 19:37:05 +00:00
|
|
|
self.config.channel.to_string()
|
2018-05-16 00:48:02 +00:00
|
|
|
};
|
2019-04-30 19:37:05 +00:00
|
|
|
// We want to make sure that none of the dependencies between
|
|
|
|
// std/test/rustc unify with one another. This is done for weird linkage
|
|
|
|
// reasons but the gist of the problem is that if librustc, libtest, and
|
|
|
|
// libstd all depend on libc from crates.io (which they actually do) we
|
|
|
|
// want to make sure they all get distinct versions. Things get really
|
|
|
|
// weird if we try to unify all these dependencies right now, namely
|
|
|
|
// around how many times the library is linked in dynamic libraries and
|
|
|
|
// such. If rustc were a static executable or if we didn't ship dylibs
|
|
|
|
// this wouldn't be a problem, but we do, so it is. This is in general
|
|
|
|
// just here to make sure things build right. If you can remove this and
|
|
|
|
// things still build right, please do!
|
|
|
|
match mode {
|
|
|
|
Mode::Std => metadata.push_str("std"),
|
2019-11-05 16:16:46 +00:00
|
|
|
// When we're building rustc tools, they're built with a search path
|
|
|
|
// that contains things built during the rustc build. For example,
|
|
|
|
// bitflags is built during the rustc build, and is a dependency of
|
|
|
|
// rustdoc as well. We're building rustdoc in a different target
|
|
|
|
// directory, though, which means that Cargo will rebuild the
|
|
|
|
// dependency. When we go on to build rustdoc, we'll look for
|
|
|
|
// bitflags, and find two different copies: one built during the
|
|
|
|
// rustc step and one that we just built. This isn't always a
|
|
|
|
// problem, somehow -- not really clear why -- but we know that this
|
|
|
|
// fixes things.
|
|
|
|
Mode::ToolRustc => metadata.push_str("tool-rustc"),
|
2020-10-15 12:23:43 +00:00
|
|
|
// Same for codegen backends.
|
|
|
|
Mode::Codegen => metadata.push_str("codegen"),
|
2019-11-05 16:16:46 +00:00
|
|
|
_ => {}
|
2019-04-30 19:37:05 +00:00
|
|
|
}
|
2018-05-16 00:48:02 +00:00
|
|
|
cargo.env("__CARGO_DEFAULT_LIB_METADATA", &metadata);
|
2017-07-05 16:20:20 +00:00
|
|
|
|
2018-12-04 18:26:54 +00:00
|
|
|
if cmd == "clippy" {
|
2019-08-15 20:42:39 +00:00
|
|
|
rustflags.arg("-Zforce-unstable-if-unmarked");
|
2018-01-29 00:09:47 +00:00
|
|
|
}
|
|
|
|
|
2020-03-15 18:43:25 +00:00
|
|
|
rustflags.arg("-Zmacro-backtrace");
|
2019-08-15 20:46:07 +00:00
|
|
|
|
2018-05-05 19:30:42 +00:00
|
|
|
let want_rustdoc = self.doc_tests != DocTests::No;
|
2018-05-05 16:04:06 +00:00
|
|
|
|
2018-06-29 21:35:10 +00:00
|
|
|
// We synthetically interpret a stage0 compiler used to build tools as a
|
|
|
|
// "raw" compiler in that it's the exact snapshot we download. Normally
|
|
|
|
// the stage0 build means it uses libraries build by the stage0
|
|
|
|
// compiler, but for tools we just use the precompiled libraries that
|
|
|
|
// we've downloaded
|
|
|
|
let use_snapshot = mode == Mode::ToolBootstrap;
|
2018-08-02 06:49:36 +00:00
|
|
|
assert!(!use_snapshot || stage == 0 || self.local_rebuild);
|
2018-06-29 21:35:10 +00:00
|
|
|
|
|
|
|
let maybe_sysroot = self.sysroot(compiler);
|
|
|
|
let sysroot = if use_snapshot { self.rustc_snapshot_sysroot() } else { &maybe_sysroot };
|
2019-02-07 15:20:17 +00:00
|
|
|
let libdir = self.rustc_libdir(compiler);
|
2018-06-29 21:35:10 +00:00
|
|
|
|
Clear out target directory if compiler has changed
Previously, we relied fully on Cargo to detect that the compiler had changed and
it needed to rebuild the standard library (or later "components"). This used to
not quite be the case prior to moving to LLVM be a separate cargo invocation;
subsequent compiles would recompile std and friends if LLVM had changed
(#67077 is the PR that changes things here).
This PR moves us to clearing out libstd when it is being compiled if the rustc
we're using has changed. We fairly harshly limit the cases in which we do this
(e.g., ignoring dry run mode, and so forth, as well as rustdoc invocations).
This is primarily because when we're not using the compiler directly, so
clearing out in other cases is likely to lead to bugs, particularly as our
deletion scheme is pretty blunt today (basically removing more than is needed,
i.e., not just the rustc artifacts).
In practice, this targeted fix does fix the known bug, though it may not fully
resolve the problem here. It's also not clear that there is a full fix hiding
here that doesn't involve a more major change (like -Zbinary-dep-depinfo was).
As a drive-by fix, don't delete the compiler before calling Build::copy, as that
also deletes the compiler.
2019-12-31 15:00:13 +00:00
|
|
|
// Clear the output directory if the real rustc we're using has changed;
|
|
|
|
// Cargo cannot detect this as it thinks rustc is bootstrap/debug/rustc.
|
|
|
|
//
|
|
|
|
// Avoid doing this during dry run as that usually means the relevant
|
|
|
|
// compiler is not yet linked/copied properly.
|
|
|
|
//
|
|
|
|
// Only clear out the directory if we're compiling std; otherwise, we
|
|
|
|
// should let Cargo take care of things for us (via depdep info)
|
2020-01-24 01:29:42 +00:00
|
|
|
if !self.config.dry_run && mode == Mode::Std && cmd == "build" {
|
Clear out target directory if compiler has changed
Previously, we relied fully on Cargo to detect that the compiler had changed and
it needed to rebuild the standard library (or later "components"). This used to
not quite be the case prior to moving to LLVM be a separate cargo invocation;
subsequent compiles would recompile std and friends if LLVM had changed
(#67077 is the PR that changes things here).
This PR moves us to clearing out libstd when it is being compiled if the rustc
we're using has changed. We fairly harshly limit the cases in which we do this
(e.g., ignoring dry run mode, and so forth, as well as rustdoc invocations).
This is primarily because when we're not using the compiler directly, so
clearing out in other cases is likely to lead to bugs, particularly as our
deletion scheme is pretty blunt today (basically removing more than is needed,
i.e., not just the rustc artifacts).
In practice, this targeted fix does fix the known bug, though it may not fully
resolve the problem here. It's also not clear that there is a full fix hiding
here that doesn't involve a more major change (like -Zbinary-dep-depinfo was).
As a drive-by fix, don't delete the compiler before calling Build::copy, as that
also deletes the compiler.
2019-12-31 15:00:13 +00:00
|
|
|
self.clear_if_dirty(&out_dir, &self.rustc(compiler));
|
|
|
|
}
|
|
|
|
|
2017-07-05 16:20:20 +00:00
|
|
|
// Customize the compiler we're running. Specify the compiler to cargo
|
|
|
|
// as our shim and then pass it some various options used to configure
|
2017-07-05 17:14:54 +00:00
|
|
|
// how the actual compiler itself is called.
|
2017-07-05 16:20:20 +00:00
|
|
|
//
|
|
|
|
// These variables are primarily all read by
|
|
|
|
// src/bootstrap/bin/{rustc.rs,rustdoc.rs}
|
2018-05-30 17:33:43 +00:00
|
|
|
cargo
|
|
|
|
.env("RUSTBUILD_NATIVE_DIR", self.native_dir(target))
|
|
|
|
.env("RUSTC_REAL", self.rustc(compiler))
|
|
|
|
.env("RUSTC_STAGE", stage.to_string())
|
2018-06-29 21:35:10 +00:00
|
|
|
.env("RUSTC_SYSROOT", &sysroot)
|
|
|
|
.env("RUSTC_LIBDIR", &libdir)
|
2022-03-03 12:12:32 +00:00
|
|
|
.env("RUSTDOC", self.bootstrap_out.join("rustdoc"))
|
2018-05-30 17:33:43 +00:00
|
|
|
.env(
|
|
|
|
"RUSTDOC_REAL",
|
2018-09-29 14:40:37 +00:00
|
|
|
if cmd == "doc" || cmd == "rustdoc" || (cmd == "test" && want_rustdoc) {
|
2019-03-03 16:50:56 +00:00
|
|
|
self.rustdoc(compiler)
|
2018-05-30 17:33:43 +00:00
|
|
|
} else {
|
|
|
|
PathBuf::from("/path/to/nowhere/rustdoc/not/required")
|
|
|
|
},
|
|
|
|
)
|
2019-08-15 20:45:20 +00:00
|
|
|
.env("RUSTC_ERROR_METADATA_DST", self.extended_error_dir())
|
|
|
|
.env("RUSTC_BREAK_ON_ICE", "1");
|
2020-09-29 23:46:32 +00:00
|
|
|
// Clippy support is a hack and uses the default `cargo-clippy` in path.
|
|
|
|
// Don't override RUSTC so that the `cargo-clippy` in path will be run.
|
|
|
|
if cmd != "clippy" {
|
2022-03-03 12:12:32 +00:00
|
|
|
cargo.env("RUSTC", self.bootstrap_out.join("rustc"));
|
2020-09-29 23:46:32 +00:00
|
|
|
}
|
2018-01-15 17:44:00 +00:00
|
|
|
|
2019-08-15 20:58:30 +00:00
|
|
|
// Dealing with rpath here is a little special, so let's go into some
|
|
|
|
// detail. First off, `-rpath` is a linker option on Unix platforms
|
|
|
|
// which adds to the runtime dynamic loader path when looking for
|
|
|
|
// dynamic libraries. We use this by default on Unix platforms to ensure
|
|
|
|
// that our nightlies behave the same on Windows, that is they work out
|
|
|
|
// of the box. This can be disabled, of course, but basically that's why
|
|
|
|
// we're gated on RUSTC_RPATH here.
|
|
|
|
//
|
|
|
|
// Ok, so the astute might be wondering "why isn't `-C rpath` used
|
2020-07-01 15:35:09 +00:00
|
|
|
// here?" and that is indeed a good question to ask. This codegen
|
2019-08-15 20:58:30 +00:00
|
|
|
// option is the compiler's current interface to generating an rpath.
|
|
|
|
// Unfortunately it doesn't quite suffice for us. The flag currently
|
|
|
|
// takes no value as an argument, so the compiler calculates what it
|
|
|
|
// should pass to the linker as `-rpath`. This unfortunately is based on
|
|
|
|
// the **compile time** directory structure which when building with
|
|
|
|
// Cargo will be very different than the runtime directory structure.
|
|
|
|
//
|
|
|
|
// All that's a really long winded way of saying that if we use
|
|
|
|
// `-Crpath` then the executables generated have the wrong rpath of
|
|
|
|
// something like `$ORIGIN/deps` when in fact the way we distribute
|
|
|
|
// rustc requires the rpath to be `$ORIGIN/../lib`.
|
|
|
|
//
|
|
|
|
// So, all in all, to set up the correct rpath we pass the linker
|
|
|
|
// argument manually via `-C link-args=-Wl,-rpath,...`. Plus isn't it
|
|
|
|
// fun to pass a flag to a tool to pass a flag to pass a flag to a tool
|
|
|
|
// to change a flag in a binary?
|
2020-07-17 14:08:04 +00:00
|
|
|
if self.config.rust_rpath && util::use_host_linker(target) {
|
2019-08-15 20:58:30 +00:00
|
|
|
let rpath = if target.contains("apple") {
|
|
|
|
// Note that we need to take one extra step on macOS to also pass
|
|
|
|
// `-Wl,-instal_name,@rpath/...` to get things to work right. To
|
|
|
|
// do that we pass a weird flag to the compiler to get it to do
|
|
|
|
// so. Note that this is definitely a hack, and we should likely
|
|
|
|
// flesh out rpath support more fully in the future.
|
|
|
|
rustflags.arg("-Zosx-rpath-install-name");
|
|
|
|
Some("-Wl,-rpath,@loader_path/../lib")
|
2019-12-09 08:46:55 +00:00
|
|
|
} else if !target.contains("windows") {
|
2021-12-17 11:27:14 +00:00
|
|
|
rustflags.arg("-Clink-args=-Wl,-z,origin");
|
2019-08-15 20:58:30 +00:00
|
|
|
Some("-Wl,-rpath,$ORIGIN/../lib")
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
};
|
|
|
|
if let Some(rpath) = rpath {
|
|
|
|
rustflags.arg(&format!("-Clink-args={}", rpath));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-09-04 17:54:07 +00:00
|
|
|
if let Some(host_linker) = self.linker(compiler.host) {
|
2017-12-06 08:25:29 +00:00
|
|
|
cargo.env("RUSTC_HOST_LINKER", host_linker);
|
|
|
|
}
|
2020-09-06 21:39:58 +00:00
|
|
|
if self.is_fuse_ld_lld(compiler.host) {
|
2020-09-06 19:07:14 +00:00
|
|
|
cargo.env("RUSTC_HOST_FUSE_LD_LLD", "1");
|
2021-06-07 19:17:11 +00:00
|
|
|
cargo.env("RUSTDOC_FUSE_LD_LLD", "1");
|
2020-09-06 19:07:14 +00:00
|
|
|
}
|
2020-01-28 18:21:22 +00:00
|
|
|
|
2020-09-04 17:54:07 +00:00
|
|
|
if let Some(target_linker) = self.linker(target) {
|
2020-07-17 14:08:04 +00:00
|
|
|
let target = crate::envify(&target.triple);
|
2019-08-15 20:51:47 +00:00
|
|
|
cargo.env(&format!("CARGO_TARGET_{}_LINKER", target), target_linker);
|
2017-12-06 08:25:29 +00:00
|
|
|
}
|
2020-09-06 21:39:58 +00:00
|
|
|
if self.is_fuse_ld_lld(target) {
|
2020-08-03 13:39:09 +00:00
|
|
|
rustflags.arg("-Clink-args=-fuse-ld=lld");
|
|
|
|
}
|
2021-06-07 19:17:11 +00:00
|
|
|
self.lld_flags(target).for_each(|flag| {
|
|
|
|
rustdocflags.arg(&flag);
|
|
|
|
});
|
2020-08-03 13:39:09 +00:00
|
|
|
|
2018-12-04 18:26:54 +00:00
|
|
|
if !(["build", "check", "clippy", "fix", "rustc"].contains(&cmd)) && want_rustdoc {
|
2019-02-07 15:20:17 +00:00
|
|
|
cargo.env("RUSTDOC_LIBDIR", self.rustc_libdir(compiler));
|
2018-01-12 07:04:02 +00:00
|
|
|
}
|
2017-07-05 16:20:20 +00:00
|
|
|
|
2019-05-05 19:15:42 +00:00
|
|
|
let debuginfo_level = match mode {
|
2020-10-15 12:23:43 +00:00
|
|
|
Mode::Rustc | Mode::Codegen => self.config.rust_debuginfo_level_rustc,
|
bootstrap: Merge the libtest build step with libstd
Since its inception rustbuild has always worked in three stages: one for
libstd, one for libtest, and one for rustc. These three stages were
architected around crates.io dependencies, where rustc wants to depend
on crates.io crates but said crates don't explicitly depend on libstd,
requiring a sysroot assembly step in the middle. This same logic was
applied for libtest where libtest wants to depend on crates.io crates
(`getopts`) but `getopts` didn't say that it depended on std, so it
needed `std` built ahead of time.
Lots of time has passed since the inception of rustbuild, however,
and we've since gotten to the point where even `std` itself is depending
on crates.io crates (albeit with some wonky configuration). This
commit applies the same logic to the two dependencies that the `test`
crate pulls in from crates.io, `getopts` and `unicode-width`. Over the
many years since rustbuild's inception `unicode-width` was the only
dependency picked up by the `test` crate, so the extra configuration
necessary to get crates building in this crate graph is unlikely to be
too much of a burden on developers.
After this patch it means that there are now only two build phasese of
rustbuild, one for libstd and one for rustc. The libtest/libproc_macro
build phase is all lumped into one now with `std`.
This was originally motivated by rust-lang/cargo#7216 where Cargo was
having to deal with synthesizing dependency edges but this commit makes
them explicit in this repository.
2019-08-16 15:29:08 +00:00
|
|
|
Mode::Std => self.config.rust_debuginfo_level_std,
|
2019-05-05 19:15:42 +00:00
|
|
|
Mode::ToolBootstrap | Mode::ToolStd | Mode::ToolRustc => {
|
bootstrap: Merge the libtest build step with libstd
Since its inception rustbuild has always worked in three stages: one for
libstd, one for libtest, and one for rustc. These three stages were
architected around crates.io dependencies, where rustc wants to depend
on crates.io crates but said crates don't explicitly depend on libstd,
requiring a sysroot assembly step in the middle. This same logic was
applied for libtest where libtest wants to depend on crates.io crates
(`getopts`) but `getopts` didn't say that it depended on std, so it
needed `std` built ahead of time.
Lots of time has passed since the inception of rustbuild, however,
and we've since gotten to the point where even `std` itself is depending
on crates.io crates (albeit with some wonky configuration). This
commit applies the same logic to the two dependencies that the `test`
crate pulls in from crates.io, `getopts` and `unicode-width`. Over the
many years since rustbuild's inception `unicode-width` was the only
dependency picked up by the `test` crate, so the extra configuration
necessary to get crates building in this crate graph is unlikely to be
too much of a burden on developers.
After this patch it means that there are now only two build phasese of
rustbuild, one for libstd and one for rustc. The libtest/libproc_macro
build phase is all lumped into one now with `std`.
This was originally motivated by rust-lang/cargo#7216 where Cargo was
having to deal with synthesizing dependency edges but this commit makes
them explicit in this repository.
2019-08-16 15:29:08 +00:00
|
|
|
self.config.rust_debuginfo_level_tools
|
2019-12-22 22:42:04 +00:00
|
|
|
}
|
2019-05-05 19:15:42 +00:00
|
|
|
};
|
2019-09-09 16:49:48 +00:00
|
|
|
cargo.env(profile_var("DEBUG"), debuginfo_level.to_string());
|
2020-06-15 14:54:20 +00:00
|
|
|
cargo.env(
|
|
|
|
profile_var("DEBUG_ASSERTIONS"),
|
|
|
|
if mode == Mode::Std {
|
|
|
|
self.config.rust_debug_assertions_std.to_string()
|
|
|
|
} else {
|
|
|
|
self.config.rust_debug_assertions.to_string()
|
|
|
|
},
|
|
|
|
);
|
2021-08-05 05:28:40 +00:00
|
|
|
cargo.env(
|
|
|
|
profile_var("OVERFLOW_CHECKS"),
|
|
|
|
if mode == Mode::Std {
|
|
|
|
self.config.rust_overflow_checks_std.to_string()
|
|
|
|
} else {
|
|
|
|
self.config.rust_overflow_checks.to_string()
|
|
|
|
},
|
|
|
|
);
|
2019-05-05 19:15:42 +00:00
|
|
|
|
2022-06-13 10:40:28 +00:00
|
|
|
let split_debuginfo_is_stable = target.contains("linux")
|
|
|
|
|| target.contains("apple")
|
|
|
|
|| (target.contains("msvc")
|
|
|
|
&& self.config.rust_split_debuginfo == SplitDebuginfo::Packed)
|
|
|
|
|| (target.contains("windows")
|
|
|
|
&& self.config.rust_split_debuginfo == SplitDebuginfo::Off);
|
|
|
|
|
|
|
|
if !split_debuginfo_is_stable {
|
|
|
|
rustflags.arg("-Zunstable-options");
|
2020-12-20 02:49:18 +00:00
|
|
|
}
|
2022-06-13 10:40:28 +00:00
|
|
|
match self.config.rust_split_debuginfo {
|
|
|
|
SplitDebuginfo::Packed => rustflags.arg("-Csplit-debuginfo=packed"),
|
|
|
|
SplitDebuginfo::Unpacked => rustflags.arg("-Csplit-debuginfo=unpacked"),
|
|
|
|
SplitDebuginfo::Off => rustflags.arg("-Csplit-debuginfo=off"),
|
|
|
|
};
|
2020-12-20 02:49:18 +00:00
|
|
|
|
2020-08-27 11:12:40 +00:00
|
|
|
if self.config.cmd.bless() {
|
|
|
|
// Bless `expect!` tests.
|
|
|
|
cargo.env("UPDATE_EXPECT", "1");
|
|
|
|
}
|
|
|
|
|
2019-05-05 19:15:42 +00:00
|
|
|
if !mode.is_tool() {
|
2017-12-06 08:25:29 +00:00
|
|
|
cargo.env("RUSTC_FORCE_UNSTABLE", "1");
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
|
|
|
|
2017-08-22 21:24:29 +00:00
|
|
|
if let Some(x) = self.crt_static(target) {
|
2019-08-15 20:57:09 +00:00
|
|
|
if x {
|
|
|
|
rustflags.arg("-Ctarget-feature=+crt-static");
|
|
|
|
} else {
|
|
|
|
rustflags.arg("-Ctarget-feature=-crt-static");
|
|
|
|
}
|
2017-08-22 21:24:29 +00:00
|
|
|
}
|
|
|
|
|
2018-04-29 09:21:47 +00:00
|
|
|
if let Some(x) = self.crt_static(compiler.host) {
|
|
|
|
cargo.env("RUSTC_HOST_CRT_STATIC", x.to_string());
|
|
|
|
}
|
|
|
|
|
2020-04-01 01:00:52 +00:00
|
|
|
if let Some(map_to) = self.build.debuginfo_map_to(GitRepo::Rustc) {
|
|
|
|
let map = format!("{}={}", self.build.src.display(), map_to);
|
2018-08-30 17:25:07 +00:00
|
|
|
cargo.env("RUSTC_DEBUGINFO_MAP", map);
|
2020-04-01 01:00:52 +00:00
|
|
|
|
|
|
|
// `rustc` needs to know the virtual `/rustc/$hash` we're mapping to,
|
|
|
|
// in order to opportunistically reverse it later.
|
|
|
|
cargo.env("CFG_VIRTUAL_RUST_SOURCE_BASE_DIR", map_to);
|
2018-08-30 17:25:07 +00:00
|
|
|
}
|
|
|
|
|
2017-07-05 16:20:20 +00:00
|
|
|
// Enable usage of unstable features
|
|
|
|
cargo.env("RUSTC_BOOTSTRAP", "1");
|
2017-07-05 17:14:54 +00:00
|
|
|
self.add_rust_test_threads(&mut cargo);
|
2017-07-05 16:20:20 +00:00
|
|
|
|
|
|
|
// Almost all of the crates that we compile as part of the bootstrap may
|
|
|
|
// have a build script, including the standard library. To compile a
|
2017-07-05 17:14:54 +00:00
|
|
|
// build script, however, it itself needs a standard library! This
|
2017-07-05 16:20:20 +00:00
|
|
|
// introduces a bit of a pickle when we're compiling the standard
|
2017-07-05 17:14:54 +00:00
|
|
|
// library itself.
|
2017-07-05 16:20:20 +00:00
|
|
|
//
|
|
|
|
// To work around this we actually end up using the snapshot compiler
|
2017-07-05 17:14:54 +00:00
|
|
|
// (stage0) for compiling build scripts of the standard library itself.
|
2017-07-05 16:20:20 +00:00
|
|
|
// The stage0 compiler is guaranteed to have a libstd available for use.
|
|
|
|
//
|
|
|
|
// For other crates, however, we know that we've already got a standard
|
|
|
|
// library up and running, so we can use the normal compiler to compile
|
|
|
|
// build scripts in that situation.
|
2019-03-02 10:43:17 +00:00
|
|
|
if mode == Mode::Std {
|
2018-05-30 17:33:43 +00:00
|
|
|
cargo
|
|
|
|
.env("RUSTC_SNAPSHOT", &self.initial_rustc)
|
|
|
|
.env("RUSTC_SNAPSHOT_LIBDIR", self.rustc_snapshot_libdir());
|
2017-07-05 16:20:20 +00:00
|
|
|
} else {
|
2018-05-30 17:33:43 +00:00
|
|
|
cargo
|
|
|
|
.env("RUSTC_SNAPSHOT", self.rustc(compiler))
|
|
|
|
.env("RUSTC_SNAPSHOT_LIBDIR", self.rustc_libdir(compiler));
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
|
|
|
|
2020-03-18 21:07:04 +00:00
|
|
|
// Tools that use compiler libraries may inherit the `-lLLVM` link
|
|
|
|
// requirement, but the `-L` library path is not propagated across
|
|
|
|
// separate Cargo projects. We can add LLVM's library path to the
|
|
|
|
// platform-specific environment variable as a workaround.
|
2021-08-13 10:33:43 +00:00
|
|
|
if mode == Mode::ToolRustc || mode == Mode::Codegen {
|
2020-03-19 17:28:47 +00:00
|
|
|
if let Some(llvm_config) = self.llvm_config(target) {
|
|
|
|
let llvm_libdir = output(Command::new(&llvm_config).arg("--libdir"));
|
|
|
|
add_link_lib_path(vec![llvm_libdir.trim().into()], &mut cargo);
|
|
|
|
}
|
2020-03-18 21:07:04 +00:00
|
|
|
}
|
|
|
|
|
2020-10-26 05:11:20 +00:00
|
|
|
// Compile everything except libraries and proc macros with the more
|
|
|
|
// efficient initial-exec TLS model. This doesn't work with `dlopen`,
|
|
|
|
// so we can't use it by default in general, but we can use it for tools
|
|
|
|
// and our own internal libraries.
|
2021-05-29 12:38:46 +00:00
|
|
|
if !mode.must_support_dlopen() && !target.triple.starts_with("powerpc-") {
|
2022-08-16 21:18:41 +00:00
|
|
|
cargo.env("RUSTC_TLS_MODEL_INITIAL_EXEC", "1");
|
2020-10-26 05:11:20 +00:00
|
|
|
}
|
|
|
|
|
2018-07-16 15:22:15 +00:00
|
|
|
if self.config.incremental {
|
2018-01-15 17:44:00 +00:00
|
|
|
cargo.env("CARGO_INCREMENTAL", "1");
|
2019-01-25 10:23:08 +00:00
|
|
|
} else {
|
|
|
|
// Don't rely on any default setting for incr. comp. in Cargo
|
|
|
|
cargo.env("CARGO_INCREMENTAL", "0");
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
|
|
|
|
2017-07-30 04:12:53 +00:00
|
|
|
if let Some(ref on_fail) = self.config.on_fail {
|
2017-07-05 16:20:20 +00:00
|
|
|
cargo.env("RUSTC_ON_FAIL", on_fail);
|
|
|
|
}
|
|
|
|
|
2018-03-16 19:10:47 +00:00
|
|
|
if self.config.print_step_timings {
|
|
|
|
cargo.env("RUSTC_PRINT_STEP_TIMINGS", "1");
|
|
|
|
}
|
|
|
|
|
2021-02-19 18:25:26 +00:00
|
|
|
if self.config.print_step_rusage {
|
|
|
|
cargo.env("RUSTC_PRINT_STEP_RUSAGE", "1");
|
|
|
|
}
|
|
|
|
|
2018-04-08 11:44:29 +00:00
|
|
|
if self.config.backtrace_on_ice {
|
|
|
|
cargo.env("RUSTC_BACKTRACE_ON_ICE", "1");
|
|
|
|
}
|
|
|
|
|
2018-07-27 09:11:18 +00:00
|
|
|
cargo.env("RUSTC_VERBOSE", self.verbosity.to_string());
|
2017-07-05 16:20:20 +00:00
|
|
|
|
2020-06-12 22:44:56 +00:00
|
|
|
if source_type == SourceType::InTree {
|
2020-07-04 21:46:04 +00:00
|
|
|
let mut lint_flags = Vec::new();
|
2019-09-09 16:29:47 +00:00
|
|
|
// When extending this list, add the new lints to the RUSTFLAGS of the
|
|
|
|
// build_bootstrap function of src/bootstrap/bootstrap.py as well as
|
|
|
|
// some code doesn't go through this `rustc` wrapper.
|
2020-07-04 21:46:04 +00:00
|
|
|
lint_flags.push("-Wrust_2018_idioms");
|
|
|
|
lint_flags.push("-Wunused_lifetimes");
|
2021-03-13 17:46:33 +00:00
|
|
|
lint_flags.push("-Wsemicolon_in_expressions_from_macros");
|
2019-09-09 16:29:47 +00:00
|
|
|
|
|
|
|
if self.config.deny_warnings {
|
2020-07-04 21:46:04 +00:00
|
|
|
lint_flags.push("-Dwarnings");
|
2020-07-16 19:32:44 +00:00
|
|
|
rustdocflags.arg("-Dwarnings");
|
2020-05-01 09:16:05 +00:00
|
|
|
}
|
2020-04-07 11:59:07 +00:00
|
|
|
|
2020-07-04 21:46:04 +00:00
|
|
|
// This does not use RUSTFLAGS due to caching issues with Cargo.
|
|
|
|
// Clippy is treated as an "in tree" tool, but shares the same
|
|
|
|
// cache as other "submodule" tools. With these options set in
|
|
|
|
// RUSTFLAGS, that causes *every* shared dependency to be rebuilt.
|
|
|
|
// By injecting this into the rustc wrapper, this circumvents
|
|
|
|
// Cargo's fingerprint detection. This is fine because lint flags
|
|
|
|
// are always ignored in dependencies. Eventually this should be
|
|
|
|
// fixed via better support from Cargo.
|
|
|
|
cargo.env("RUSTC_LINT_FLAGS", lint_flags.join(" "));
|
2020-07-13 14:29:12 +00:00
|
|
|
|
2021-03-26 20:10:21 +00:00
|
|
|
rustdocflags.arg("-Wrustdoc::invalid_codeblock_attributes");
|
2018-04-01 15:35:53 +00:00
|
|
|
}
|
|
|
|
|
2020-09-05 17:33:00 +00:00
|
|
|
if mode == Mode::Rustc {
|
2019-09-10 16:10:24 +00:00
|
|
|
rustflags.arg("-Zunstable-options");
|
|
|
|
rustflags.arg("-Wrustc::internal");
|
2019-09-09 16:31:42 +00:00
|
|
|
}
|
|
|
|
|
2017-12-06 08:25:29 +00:00
|
|
|
// Throughout the build Cargo can execute a number of build scripts
|
|
|
|
// compiling C/C++ code and we need to pass compilers, archivers, flags, etc
|
|
|
|
// obtained previously to those build scripts.
|
|
|
|
// Build scripts use either the `cc` crate or `configure/make` so we pass
|
|
|
|
// the options through environment variables that are fetched and understood by both.
|
2017-07-05 16:20:20 +00:00
|
|
|
//
|
|
|
|
// FIXME: the guard against msvc shouldn't need to be here
|
2018-04-24 15:34:14 +00:00
|
|
|
if target.contains("msvc") {
|
|
|
|
if let Some(ref cl) = self.config.llvm_clang_cl {
|
|
|
|
cargo.env("CC", cl).env("CXX", cl);
|
|
|
|
}
|
|
|
|
} else {
|
2018-03-01 05:25:12 +00:00
|
|
|
let ccache = self.config.ccache.as_ref();
|
|
|
|
let ccacheify = |s: &Path| {
|
|
|
|
let ccache = match ccache {
|
|
|
|
Some(ref s) => s,
|
|
|
|
None => return s.display().to_string(),
|
|
|
|
};
|
|
|
|
// FIXME: the cc-rs crate only recognizes the literal strings
|
|
|
|
// `ccache` and `sccache` when doing caching compilations, so we
|
|
|
|
// mirror that here. It should probably be fixed upstream to
|
|
|
|
// accept a new env var or otherwise work with custom ccache
|
|
|
|
// vars.
|
|
|
|
match &ccache[..] {
|
|
|
|
"ccache" | "sccache" => format!("{} {}", ccache, s.display()),
|
|
|
|
_ => s.display().to_string(),
|
|
|
|
}
|
|
|
|
};
|
|
|
|
let cc = ccacheify(&self.cc(target));
|
2020-07-17 14:08:04 +00:00
|
|
|
cargo.env(format!("CC_{}", target.triple), &cc);
|
2017-12-06 08:25:29 +00:00
|
|
|
|
2022-03-01 00:40:08 +00:00
|
|
|
let cflags = self.cflags(target, GitRepo::Rustc, CLang::C).join(" ");
|
2020-09-15 04:08:37 +00:00
|
|
|
cargo.env(format!("CFLAGS_{}", target.triple), &cflags);
|
2017-12-06 08:25:29 +00:00
|
|
|
|
|
|
|
if let Some(ar) = self.ar(target) {
|
|
|
|
let ranlib = format!("{} s", ar.display());
|
2020-07-17 14:08:04 +00:00
|
|
|
cargo
|
|
|
|
.env(format!("AR_{}", target.triple), ar)
|
|
|
|
.env(format!("RANLIB_{}", target.triple), ranlib);
|
2017-12-06 08:25:29 +00:00
|
|
|
}
|
2017-07-05 16:20:20 +00:00
|
|
|
|
2017-07-05 17:14:54 +00:00
|
|
|
if let Ok(cxx) = self.cxx(target) {
|
2018-03-01 05:25:12 +00:00
|
|
|
let cxx = ccacheify(&cxx);
|
2022-03-01 00:40:08 +00:00
|
|
|
let cxxflags = self.cflags(target, GitRepo::Rustc, CLang::Cxx).join(" ");
|
2018-05-30 17:33:43 +00:00
|
|
|
cargo
|
2020-07-17 14:08:04 +00:00
|
|
|
.env(format!("CXX_{}", target.triple), &cxx)
|
2022-03-01 00:40:08 +00:00
|
|
|
.env(format!("CXXFLAGS_{}", target.triple), cxxflags);
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-05-30 17:33:43 +00:00
|
|
|
if mode == Mode::Std && self.config.extended && compiler.is_final_stage(self) {
|
2019-08-15 20:54:36 +00:00
|
|
|
rustflags.arg("-Zsave-analysis");
|
|
|
|
cargo.env(
|
|
|
|
"RUST_SAVE_ANALYSIS_CONFIG",
|
|
|
|
"{\"output_file\": null,\"full_docs\": false,\
|
|
|
|
\"pub_only\": true,\"reachable_only\": false,\
|
|
|
|
\"distro_crate\": true,\"signatures\": false,\"borrow_data\": false}",
|
|
|
|
);
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
|
|
|
|
2020-06-16 16:44:03 +00:00
|
|
|
// If Control Flow Guard is enabled, pass the `control-flow-guard` flag to rustc
|
2020-01-28 14:29:44 +00:00
|
|
|
// when compiling the standard library, since this might be linked into the final outputs
|
|
|
|
// produced by rustc. Since this mitigation is only available on Windows, only enable it
|
|
|
|
// for the standard library in case the compiler is run on a non-Windows platform.
|
|
|
|
// This is not needed for stage 0 artifacts because these will only be used for building
|
|
|
|
// the stage 1 compiler.
|
|
|
|
if cfg!(windows)
|
|
|
|
&& mode == Mode::Std
|
|
|
|
&& self.config.control_flow_guard
|
|
|
|
&& compiler.stage >= 1
|
|
|
|
{
|
2020-07-14 14:27:42 +00:00
|
|
|
rustflags.arg("-Ccontrol-flow-guard");
|
2020-01-28 14:29:44 +00:00
|
|
|
}
|
|
|
|
|
2017-12-06 08:25:29 +00:00
|
|
|
// For `cargo doc` invocations, make rustdoc print the Rust version into the docs
|
2020-08-15 00:52:09 +00:00
|
|
|
// This replaces spaces with newlines because RUSTDOCFLAGS does not
|
|
|
|
// support arguments with regular spaces. Hopefully someday Cargo will
|
|
|
|
// have space support.
|
|
|
|
let rust_version = self.rust_version().replace(' ', "\n");
|
|
|
|
rustdocflags.arg("--crate-version").arg(&rust_version);
|
2017-12-06 08:25:29 +00:00
|
|
|
|
2017-07-05 16:20:20 +00:00
|
|
|
// Environment variables *required* throughout the build
|
|
|
|
//
|
|
|
|
// FIXME: should update code to not require this env var
|
2020-07-17 14:08:04 +00:00
|
|
|
cargo.env("CFG_COMPILER_HOST_TRIPLE", target.triple);
|
2017-07-05 16:20:20 +00:00
|
|
|
|
2017-07-25 23:59:31 +00:00
|
|
|
// Set this for all builds to make sure doc builds also get it.
|
2018-04-14 23:27:57 +00:00
|
|
|
cargo.env("CFG_RELEASE_CHANNEL", &self.config.channel);
|
2017-07-25 23:59:31 +00:00
|
|
|
|
2018-01-08 21:56:22 +00:00
|
|
|
// This one's a bit tricky. As of the time of this writing the compiler
|
|
|
|
// links to the `winapi` crate on crates.io. This crate provides raw
|
|
|
|
// bindings to Windows system functions, sort of like libc does for
|
|
|
|
// Unix. This crate also, however, provides "import libraries" for the
|
|
|
|
// MinGW targets. There's an import library per dll in the windows
|
|
|
|
// distribution which is what's linked to. These custom import libraries
|
|
|
|
// are used because the winapi crate can reference Windows functions not
|
|
|
|
// present in the MinGW import libraries.
|
|
|
|
//
|
|
|
|
// For example MinGW may ship libdbghelp.a, but it may not have
|
|
|
|
// references to all the functions in the dbghelp dll. Instead the
|
|
|
|
// custom import library for dbghelp in the winapi crates has all this
|
|
|
|
// information.
|
|
|
|
//
|
|
|
|
// Unfortunately for us though the import libraries are linked by
|
|
|
|
// default via `-ldylib=winapi_foo`. That is, they're linked with the
|
|
|
|
// `dylib` type with a `winapi_` prefix (so the winapi ones don't
|
|
|
|
// conflict with the system MinGW ones). This consequently means that
|
2018-05-08 13:10:16 +00:00
|
|
|
// the binaries we ship of things like rustc_codegen_llvm (aka the rustc_codegen_llvm
|
2018-01-08 21:56:22 +00:00
|
|
|
// DLL) when linked against *again*, for example with procedural macros
|
|
|
|
// or plugins, will trigger the propagation logic of `-ldylib`, passing
|
|
|
|
// `-lwinapi_foo` to the linker again. This isn't actually available in
|
|
|
|
// our distribution, however, so the link fails.
|
|
|
|
//
|
|
|
|
// To solve this problem we tell winapi to not use its bundled import
|
|
|
|
// libraries. This means that it will link to the system MinGW import
|
|
|
|
// libraries by default, and the `-ldylib=foo` directives will still get
|
|
|
|
// passed to the final linker, but they'll look like `-lfoo` which can
|
|
|
|
// be resolved because MinGW has the import library. The downside is we
|
|
|
|
// don't get newer functions from Windows, but we don't use any of them
|
|
|
|
// anyway.
|
2018-05-27 23:56:33 +00:00
|
|
|
if !mode.is_tool() {
|
2018-02-26 17:07:16 +00:00
|
|
|
cargo.env("WINAPI_NO_BUNDLED_LIBRARIES", "1");
|
|
|
|
}
|
2018-01-08 21:56:22 +00:00
|
|
|
|
2021-10-16 12:30:24 +00:00
|
|
|
for _ in 0..self.verbosity {
|
2017-07-05 16:20:20 +00:00
|
|
|
cargo.arg("-v");
|
|
|
|
}
|
2018-01-28 22:50:03 +00:00
|
|
|
|
2018-10-22 14:39:36 +00:00
|
|
|
match (mode, self.config.rust_codegen_units_std, self.config.rust_codegen_units) {
|
|
|
|
(Mode::Std, Some(n), _) | (_, _, Some(n)) => {
|
2019-09-09 16:42:56 +00:00
|
|
|
cargo.env(profile_var("CODEGEN_UNITS"), n.to_string());
|
2018-10-22 14:39:36 +00:00
|
|
|
}
|
|
|
|
_ => {
|
|
|
|
// Don't set anything
|
|
|
|
}
|
2018-01-28 22:50:03 +00:00
|
|
|
}
|
|
|
|
|
2017-12-06 08:25:29 +00:00
|
|
|
if self.config.rust_optimize {
|
2018-05-25 12:04:27 +00:00
|
|
|
// FIXME: cargo bench/install do not accept `--release`
|
|
|
|
if cmd != "bench" && cmd != "install" {
|
2017-12-06 08:25:29 +00:00
|
|
|
cargo.arg("--release");
|
|
|
|
}
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
2018-01-28 22:50:03 +00:00
|
|
|
|
2017-07-05 17:14:54 +00:00
|
|
|
if self.config.locked_deps {
|
2017-07-05 16:20:20 +00:00
|
|
|
cargo.arg("--locked");
|
|
|
|
}
|
2017-07-05 17:14:54 +00:00
|
|
|
if self.config.vendor || self.is_sudo {
|
2017-07-05 16:20:20 +00:00
|
|
|
cargo.arg("--frozen");
|
|
|
|
}
|
|
|
|
|
2019-11-11 22:22:23 +00:00
|
|
|
// Try to use a sysroot-relative bindir, in case it was configured absolutely.
|
2019-11-12 17:42:46 +00:00
|
|
|
cargo.env("RUSTC_INSTALL_BINDIR", self.config.bindir_relative());
|
2019-09-10 01:01:41 +00:00
|
|
|
|
2017-07-05 17:14:54 +00:00
|
|
|
self.ci_env.force_coloring_in_ci(&mut cargo);
|
2017-07-05 16:20:20 +00:00
|
|
|
|
2019-09-09 17:31:22 +00:00
|
|
|
// When we build Rust dylibs they're all intended for intermediate
|
|
|
|
// usage, so make sure we pass the -Cprefer-dynamic flag instead of
|
|
|
|
// linking all deps statically into the dylib.
|
2020-09-05 17:33:00 +00:00
|
|
|
if matches!(mode, Mode::Std | Mode::Rustc) {
|
2019-09-10 16:10:24 +00:00
|
|
|
rustflags.arg("-Cprefer-dynamic");
|
2019-09-09 17:31:22 +00:00
|
|
|
}
|
|
|
|
|
2019-12-20 13:38:28 +00:00
|
|
|
// When building incrementally we default to a lower ThinLTO import limit
|
|
|
|
// (unless explicitly specified otherwise). This will produce a somewhat
|
|
|
|
// slower code but give way better compile times.
|
|
|
|
{
|
|
|
|
let limit = match self.config.rust_thin_lto_import_instr_limit {
|
|
|
|
Some(limit) => Some(limit),
|
|
|
|
None if self.config.incremental => Some(10),
|
|
|
|
_ => None,
|
|
|
|
};
|
|
|
|
|
|
|
|
if let Some(limit) = limit {
|
|
|
|
rustflags.arg(&format!("-Cllvm-args=-import-instr-limit={}", limit));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-04-23 18:24:28 +00:00
|
|
|
Cargo { command: cargo, rustflags, rustdocflags }
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
|
|
|
|
2018-04-11 22:36:42 +00:00
|
|
|
/// Ensure that a given step is built, returning its output. This will
|
2017-07-07 17:17:37 +00:00
|
|
|
/// cache the step, so it is safe (and good!) to call this as often as
|
|
|
|
/// needed to ensure that all dependencies are built.
|
2017-07-14 00:48:44 +00:00
|
|
|
pub fn ensure<S: Step>(&'a self, step: S) -> S::Output {
|
2017-07-05 16:20:20 +00:00
|
|
|
{
|
|
|
|
let mut stack = self.stack.borrow_mut();
|
2017-07-18 00:01:48 +00:00
|
|
|
for stack_step in stack.iter() {
|
|
|
|
// should skip
|
2018-05-30 17:33:43 +00:00
|
|
|
if stack_step.downcast_ref::<S>().map_or(true, |stack_step| *stack_step != step) {
|
2017-07-18 00:01:48 +00:00
|
|
|
continue;
|
2017-07-14 00:48:44 +00:00
|
|
|
}
|
2017-07-05 16:20:20 +00:00
|
|
|
let mut out = String::new();
|
2017-07-14 00:48:44 +00:00
|
|
|
out += &format!("\n\nCycle in build detected when adding {:?}\n", step);
|
2017-07-05 16:20:20 +00:00
|
|
|
for el in stack.iter().rev() {
|
|
|
|
out += &format!("\t{:?}\n", el);
|
|
|
|
}
|
2021-02-09 03:51:21 +00:00
|
|
|
panic!("{}", out);
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
2017-07-14 00:48:44 +00:00
|
|
|
if let Some(out) = self.cache.get(&step) {
|
Don't print bootstrap caching/ensure info unless `-vv` is passed
Previously, passing `-v` would emit an overwhelming amount of logging:
```
> Std { stage: 1, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
> Assemble { target_compiler: Compiler { stage: 1, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
> Assemble { target_compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
< Assemble { target_compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
> Rustc { target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None }, compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
> Std { target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None }, compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
> StartupObjects { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
< StartupObjects { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
c Assemble { target_compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
> Libdir { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
> Sysroot { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
< Sysroot { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
< Libdir { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
c Libdir { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
c Sysroot { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
c Assemble { target_compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
> StdLink { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target_compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
c Libdir { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
c Libdir { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
< StdLink { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target_compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
< Std { target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None }, compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
... continues for another 150 lines ...
```
This info is occasionally useful when debugging bootstrap itself, but not very useful for figuring
out why a config option was ignored or command wasn't run. Demote it to `-vv` logging so that `-v`
is more useful.
2021-12-09 17:15:38 +00:00
|
|
|
self.verbose_than(1, &format!("{}c {:?}", " ".repeat(stack.len()), step));
|
2017-07-05 16:20:20 +00:00
|
|
|
|
|
|
|
return out;
|
|
|
|
}
|
Don't print bootstrap caching/ensure info unless `-vv` is passed
Previously, passing `-v` would emit an overwhelming amount of logging:
```
> Std { stage: 1, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
> Assemble { target_compiler: Compiler { stage: 1, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
> Assemble { target_compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
< Assemble { target_compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
> Rustc { target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None }, compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
> Std { target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None }, compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
> StartupObjects { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
< StartupObjects { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
c Assemble { target_compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
> Libdir { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
> Sysroot { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
< Sysroot { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
< Libdir { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
c Libdir { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
c Sysroot { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
c Assemble { target_compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
> StdLink { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target_compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
c Libdir { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
c Libdir { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
< StdLink { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target_compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
< Std { target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None }, compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
... continues for another 150 lines ...
```
This info is occasionally useful when debugging bootstrap itself, but not very useful for figuring
out why a config option was ignored or command wasn't run. Demote it to `-vv` logging so that `-v`
is more useful.
2021-12-09 17:15:38 +00:00
|
|
|
self.verbose_than(1, &format!("{}> {:?}", " ".repeat(stack.len()), step));
|
2017-07-18 00:01:48 +00:00
|
|
|
stack.push(Box::new(step.clone()));
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
2018-03-16 19:10:47 +00:00
|
|
|
|
2022-02-06 22:03:55 +00:00
|
|
|
#[cfg(feature = "build-metrics")]
|
|
|
|
self.metrics.enter_step(&step);
|
|
|
|
|
2018-03-16 19:10:47 +00:00
|
|
|
let (out, dur) = {
|
|
|
|
let start = Instant::now();
|
|
|
|
let zero = Duration::new(0, 0);
|
|
|
|
let parent = self.time_spent_on_dependencies.replace(zero);
|
|
|
|
let out = step.clone().run(self);
|
|
|
|
let dur = start.elapsed();
|
|
|
|
let deps = self.time_spent_on_dependencies.replace(parent + dur);
|
|
|
|
(out, dur - deps)
|
|
|
|
};
|
|
|
|
|
2020-09-15 12:59:34 +00:00
|
|
|
if self.config.print_step_timings && !self.config.dry_run {
|
2022-04-16 03:32:18 +00:00
|
|
|
let step_string = format!("{:?}", step);
|
|
|
|
let brace_index = step_string.find("{").unwrap_or(0);
|
|
|
|
let type_string = type_name::<S>();
|
|
|
|
println!(
|
|
|
|
"[TIMING] {} {} -- {}.{:03}",
|
|
|
|
&type_string.strip_prefix("bootstrap::").unwrap_or(type_string),
|
|
|
|
&step_string[brace_index..],
|
|
|
|
dur.as_secs(),
|
|
|
|
dur.subsec_millis()
|
|
|
|
);
|
2018-03-16 19:10:47 +00:00
|
|
|
}
|
|
|
|
|
2022-02-06 22:03:55 +00:00
|
|
|
#[cfg(feature = "build-metrics")]
|
|
|
|
self.metrics.exit_step();
|
|
|
|
|
2017-07-05 16:20:20 +00:00
|
|
|
{
|
|
|
|
let mut stack = self.stack.borrow_mut();
|
2017-07-18 00:01:48 +00:00
|
|
|
let cur_step = stack.pop().expect("step stack empty");
|
|
|
|
assert_eq!(cur_step.downcast_ref(), Some(&step));
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
Don't print bootstrap caching/ensure info unless `-vv` is passed
Previously, passing `-v` would emit an overwhelming amount of logging:
```
> Std { stage: 1, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
> Assemble { target_compiler: Compiler { stage: 1, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
> Assemble { target_compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
< Assemble { target_compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
> Rustc { target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None }, compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
> Std { target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None }, compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
> StartupObjects { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
< StartupObjects { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
c Assemble { target_compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
> Libdir { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
> Sysroot { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
< Sysroot { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
< Libdir { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
c Libdir { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
c Sysroot { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
c Assemble { target_compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
> StdLink { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target_compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
c Libdir { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
c Libdir { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
< StdLink { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target_compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }
< Std { target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None }, compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
... continues for another 150 lines ...
```
This info is occasionally useful when debugging bootstrap itself, but not very useful for figuring
out why a config option was ignored or command wasn't run. Demote it to `-vv` logging so that `-v`
is more useful.
2021-12-09 17:15:38 +00:00
|
|
|
self.verbose_than(1, &format!("{}< {:?}", " ".repeat(self.stack.borrow().len()), step));
|
2017-07-14 00:48:44 +00:00
|
|
|
self.cache.put(step, out.clone());
|
|
|
|
out
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
2021-07-23 14:51:43 +00:00
|
|
|
|
|
|
|
/// Ensure that a given step is built *only if it's supposed to be built by default*, returning
|
|
|
|
/// its output. This will cache the step, so it's safe (and good!) to call this as often as
|
|
|
|
/// needed to ensure that all dependencies are build.
|
|
|
|
pub(crate) fn ensure_if_default<T, S: Step<Output = Option<T>>>(
|
|
|
|
&'a self,
|
|
|
|
step: S,
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
kind: Kind,
|
2021-07-23 14:51:43 +00:00
|
|
|
) -> S::Output {
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
let desc = StepDescription::from::<S>(kind);
|
|
|
|
let should_run = (desc.should_run)(ShouldRun::new(self, desc.kind));
|
2021-07-23 14:51:43 +00:00
|
|
|
|
|
|
|
// Avoid running steps contained in --exclude
|
|
|
|
for pathset in &should_run.paths {
|
|
|
|
if desc.is_excluded(self, pathset) {
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Only execute if it's supposed to run as default
|
|
|
|
if desc.default && should_run.is_really_default() { self.ensure(step) } else { None }
|
|
|
|
}
|
2021-09-22 20:25:42 +00:00
|
|
|
|
|
|
|
/// Checks if any of the "should_run" paths is in the `Builder` paths.
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
pub(crate) fn was_invoked_explicitly<S: Step>(&'a self, kind: Kind) -> bool {
|
|
|
|
let desc = StepDescription::from::<S>(kind);
|
|
|
|
let should_run = (desc.should_run)(ShouldRun::new(self, desc.kind));
|
2021-09-22 20:25:42 +00:00
|
|
|
|
|
|
|
for path in &self.paths {
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
if should_run.paths.iter().any(|s| s.has(path, Some(desc.kind)))
|
|
|
|
&& !desc.is_excluded(
|
|
|
|
self,
|
2022-03-11 19:38:31 +00:00
|
|
|
&PathSet::Suite(TaskPath { path: path.clone(), kind: Some(desc.kind) }),
|
allow excluding paths only from a single module
x.py has support for excluding some steps from the invocation, but
unfortunately that's not granular enough: some steps have the same name
in different modules, and that prevents excluding only *some* of them.
As a practical example, let's say you need to run everything in `./x.py
test` except for the standard library tests, as those tests require IPv6
and need to be executed on a separate machine. Before this commit, if
you were to just run this:
./x.py test --exclude library/std
...the execution would fail, as that would not only exclude running the
tests for the standard library, it would also exclude generating its
documentation (breaking linkchecker).
This commit adds support for an optional module annotation in --exclude
paths, allowing the user to choose which module to exclude from:
./x.py test --exclude test::library/std
This maintains backward compatibility, but also allows for more ganular
exclusion. More examples on how this works:
| `--exclude` | Docs | Tests |
| ------------------- | ------- | ------- |
| `library/std` | Skipped | Skipped |
| `doc::library/std` | Skipped | Run |
| `test::library/std` | Run | Skipped |
Note that the new behavior only works in the `--exclude` flag, and not
in other x.py arguments or flags yet.
2021-12-15 11:51:26 +00:00
|
|
|
)
|
2021-09-22 20:25:42 +00:00
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
false
|
|
|
|
}
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
Add tests to rustbuild
In order to run tests, previous commits have cfg'd out various parts of
rustbuild. Generally speaking, these are filesystem-related operations
and process-spawning related parts. Then, rustbuild is run "as normal"
and the various steps that where run are retrieved from the cache and
checked against the expected results.
Note that this means that the current implementation primarily tests
"what" we build, but doesn't actually test that what we build *will*
build. In other words, it doesn't do any form of dependency verification
for any crate. This is possible to implement, but is considered future
work.
This implementation strives to cfg out as little code as possible; it
also does not currently test anywhere near all of rustbuild. The current
tests are also not checked for "correctness," rather, they simply
represent what we do as of this commit, which may be wrong.
Test cases are drawn from the old implementation of rustbuild, though
the expected results may vary.
2018-03-10 14:03:06 +00:00
|
|
|
|
|
|
|
#[cfg(test)]
|
2019-06-15 19:21:51 +00:00
|
|
|
mod tests;
|
2019-08-15 20:42:39 +00:00
|
|
|
|
2020-04-23 18:24:28 +00:00
|
|
|
#[derive(Debug, Clone)]
|
2021-02-20 01:11:09 +00:00
|
|
|
struct Rustflags(String, TargetSelection);
|
2019-08-15 20:42:39 +00:00
|
|
|
|
|
|
|
impl Rustflags {
|
2020-07-17 14:08:04 +00:00
|
|
|
fn new(target: TargetSelection) -> Rustflags {
|
2021-02-20 01:11:09 +00:00
|
|
|
let mut ret = Rustflags(String::new(), target);
|
|
|
|
ret.propagate_cargo_env("RUSTFLAGS");
|
|
|
|
ret
|
|
|
|
}
|
2019-09-09 16:20:29 +00:00
|
|
|
|
2021-02-20 01:11:09 +00:00
|
|
|
/// By default, cargo will pick up on various variables in the environment. However, bootstrap
|
2022-03-15 01:00:08 +00:00
|
|
|
/// reuses those variables to pass additional flags to rustdoc, so by default they get overridden.
|
2021-02-20 01:11:09 +00:00
|
|
|
/// Explicitly add back any previous value in the environment.
|
|
|
|
///
|
|
|
|
/// `prefix` is usually `RUSTFLAGS` or `RUSTDOCFLAGS`.
|
|
|
|
fn propagate_cargo_env(&mut self, prefix: &str) {
|
2019-09-10 16:10:24 +00:00
|
|
|
// Inherit `RUSTFLAGS` by default ...
|
2021-02-20 01:11:09 +00:00
|
|
|
self.env(prefix);
|
2019-09-09 16:20:29 +00:00
|
|
|
|
2021-02-20 01:11:09 +00:00
|
|
|
// ... and also handle target-specific env RUSTFLAGS if they're configured.
|
|
|
|
let target_specific = format!("CARGO_TARGET_{}_{}", crate::envify(&self.1.triple), prefix);
|
|
|
|
self.env(&target_specific);
|
2019-08-15 20:42:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
fn env(&mut self, env: &str) {
|
|
|
|
if let Ok(s) = env::var(env) {
|
2020-08-15 00:52:09 +00:00
|
|
|
for part in s.split(' ') {
|
2019-08-15 20:42:39 +00:00
|
|
|
self.arg(part);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn arg(&mut self, arg: &str) -> &mut Self {
|
2020-08-15 00:52:09 +00:00
|
|
|
assert_eq!(arg.split(' ').count(), 1);
|
2020-02-03 19:13:30 +00:00
|
|
|
if !self.0.is_empty() {
|
2020-12-30 21:52:04 +00:00
|
|
|
self.0.push(' ');
|
2019-08-15 20:42:39 +00:00
|
|
|
}
|
|
|
|
self.0.push_str(arg);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
}
|
2019-09-09 17:17:38 +00:00
|
|
|
|
|
|
|
#[derive(Debug)]
|
|
|
|
pub struct Cargo {
|
|
|
|
command: Command,
|
|
|
|
rustflags: Rustflags,
|
2020-04-23 18:24:28 +00:00
|
|
|
rustdocflags: Rustflags,
|
2019-09-09 17:17:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
impl Cargo {
|
2020-07-19 13:18:32 +00:00
|
|
|
pub fn rustdocflag(&mut self, arg: &str) -> &mut Cargo {
|
|
|
|
self.rustdocflags.arg(arg);
|
|
|
|
self
|
|
|
|
}
|
2019-09-09 17:21:15 +00:00
|
|
|
pub fn rustflag(&mut self, arg: &str) -> &mut Cargo {
|
|
|
|
self.rustflags.arg(arg);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2019-09-09 17:17:38 +00:00
|
|
|
pub fn arg(&mut self, arg: impl AsRef<OsStr>) -> &mut Cargo {
|
|
|
|
self.command.arg(arg.as_ref());
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn args<I, S>(&mut self, args: I) -> &mut Cargo
|
|
|
|
where
|
|
|
|
I: IntoIterator<Item = S>,
|
|
|
|
S: AsRef<OsStr>,
|
|
|
|
{
|
|
|
|
for arg in args {
|
|
|
|
self.arg(arg.as_ref());
|
|
|
|
}
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn env(&mut self, key: impl AsRef<OsStr>, value: impl AsRef<OsStr>) -> &mut Cargo {
|
2020-07-19 13:18:32 +00:00
|
|
|
// These are managed through rustflag/rustdocflag interfaces.
|
|
|
|
assert_ne!(key.as_ref(), "RUSTFLAGS");
|
|
|
|
assert_ne!(key.as_ref(), "RUSTDOCFLAGS");
|
2019-09-09 17:17:38 +00:00
|
|
|
self.command.env(key.as_ref(), value.as_ref());
|
|
|
|
self
|
|
|
|
}
|
2020-09-14 21:42:56 +00:00
|
|
|
|
|
|
|
pub fn add_rustc_lib_path(&mut self, builder: &Builder<'_>, compiler: Compiler) {
|
|
|
|
builder.add_rustc_lib_path(compiler, &mut self.command);
|
|
|
|
}
|
2021-04-14 13:20:49 +00:00
|
|
|
|
|
|
|
pub fn current_dir(&mut self, dir: &Path) -> &mut Cargo {
|
|
|
|
self.command.current_dir(dir);
|
|
|
|
self
|
|
|
|
}
|
2019-09-09 17:17:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
impl From<Cargo> for Command {
|
|
|
|
fn from(mut cargo: Cargo) -> Command {
|
2020-04-24 16:19:58 +00:00
|
|
|
let rustflags = &cargo.rustflags.0;
|
|
|
|
if !rustflags.is_empty() {
|
|
|
|
cargo.command.env("RUSTFLAGS", rustflags);
|
|
|
|
}
|
|
|
|
|
|
|
|
let rustdocflags = &cargo.rustdocflags.0;
|
|
|
|
if !rustdocflags.is_empty() {
|
|
|
|
cargo.command.env("RUSTDOCFLAGS", rustdocflags);
|
|
|
|
}
|
|
|
|
|
2019-09-09 17:17:38 +00:00
|
|
|
cargo.command
|
|
|
|
}
|
|
|
|
}
|