diff options
| author | bors <bors@rust-lang.org> | 2018-02-04 22:58:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-02-04 22:58:10 +0000 |
| commit | e7e982ac03b496dd4d4b5c182fdcd5fb4f2b5470 (patch) | |
| tree | 3495f1e9721731384fae0e1c2a6209fd1402a76f /src/bootstrap | |
| parent | 0c6091fbd0eee290c651f73be899f221eeab3c05 (diff) | |
| parent | e17ebdf344401c265ade3b02bb68df0d0485d71a (diff) | |
| download | rust-e7e982ac03b496dd4d4b5c182fdcd5fb4f2b5470.tar.gz rust-e7e982ac03b496dd4d4b5c182fdcd5fb4f2b5470.zip | |
Auto merge of #47998 - kennytm:rollup, r=kennytm
Rollup of 10 pull requests - Successful merges: #47862, #47877, #47896, #47912, #47947, #47958, #47978, #47996, #47999, #47892 - Failed merges:
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/test.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index 5fdc6e00920..e4c1cdb79fd 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -610,7 +610,6 @@ static HOST_COMPILETESTS: &[Test] = &[ mode: "incremental", suite: "incremental-fulldeps", }, - Test { path: "src/test/run-make", mode: "run-make", suite: "run-make" }, Test { path: "src/test/rustdoc", mode: "rustdoc", suite: "rustdoc" }, Test { path: "src/test/pretty", mode: "pretty", suite: "pretty" }, @@ -619,6 +618,7 @@ static HOST_COMPILETESTS: &[Test] = &[ Test { path: "src/test/run-pass-valgrind/pretty", mode: "pretty", suite: "run-pass-valgrind" }, Test { path: "src/test/run-pass-fulldeps/pretty", mode: "pretty", suite: "run-pass-fulldeps" }, Test { path: "src/test/run-fail-fulldeps/pretty", mode: "pretty", suite: "run-fail-fulldeps" }, + Test { path: "src/test/run-make", mode: "run-make", suite: "run-make" }, ]; #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] |