diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2016-09-04 07:52:36 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2016-09-04 21:01:00 +0800 |
| commit | 55893f0da7427c14be55837fada2d062db387ec9 (patch) | |
| tree | 5e7eb63f8f244e3d1961b69dacb8bfeacdff849b /src/bootstrap | |
| parent | 8ee0b6b6c1335ece087a315f351baca92ced4da2 (diff) | |
| parent | 0efc4bf387f962f7ba56a9bc0179fcc72701f53c (diff) | |
| download | rust-55893f0da7427c14be55837fada2d062db387ec9.tar.gz rust-55893f0da7427c14be55837fada2d062db387ec9.zip | |
Rollup merge of #36234 - durka:disable-codegen-config, r=alexcrichton
rustbuild: add config.toml option to disable codegen tests Fixes #36232. I think it worked? Here's a build log where I tried to bootstrap, it crashed, then I added the setting to config.toml and it continued: https://gist.github.com/durka/cbf97cf04b8e065f1a2cfda4c1b6bf95 r? @alexcrichton
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/config.rs | 2 | ||||
| -rw-r--r-- | src/bootstrap/config.toml.example | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index 682a6f74126..c1af7bd794c 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -144,6 +144,7 @@ struct Rust { rpath: Option<bool>, optimize_tests: Option<bool>, debuginfo_tests: Option<bool>, + codegen_tests: Option<bool>, } /// TOML representation of how each build target is configured. @@ -232,6 +233,7 @@ impl Config { set(&mut config.rust_optimize, rust.optimize); set(&mut config.rust_optimize_tests, rust.optimize_tests); set(&mut config.rust_debuginfo_tests, rust.debuginfo_tests); + set(&mut config.codegen_tests, rust.codegen_tests); set(&mut config.rust_rpath, rust.rpath); set(&mut config.debug_jemalloc, rust.debug_jemalloc); set(&mut config.use_jemalloc, rust.use_jemalloc); diff --git a/src/bootstrap/config.toml.example b/src/bootstrap/config.toml.example index 20c91960e9e..fcbd1d33309 100644 --- a/src/bootstrap/config.toml.example +++ b/src/bootstrap/config.toml.example @@ -133,6 +133,10 @@ #optimize-tests = true #debuginfo-tests = true +# Flag indicating whether codegen tests will be run or not. If you get an error +# saying that the FileCheck executable is missing, you may want to disable this. +#codegen-tests = true + # ============================================================================= # Options for specific targets # |
