about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-09-18 01:50:29 +0000
committerbors <bors@rust-lang.org>2017-09-18 01:50:29 +0000
commitcaad2560bfbd0e2b0e0dcb6882395c1523a1aadc (patch)
tree382ef1cea7a7de3e7184782db64c62f861ec6314 /src/libstd
parente8a76d8accf04047a938ba43b32d5ff9ab581715 (diff)
parent01555b1da1bb0fb289b1c971a046b315c751c861 (diff)
Auto merge of #43628 - oli-obk:orbital_standard_library, r=alexcrichton
Run the miri test suite on the aux builder and travis

Reopen of #38350

see https://github.com/rust-lang/rust/pull/43340#issuecomment-316940762 for earlier discussion

Rationale for running miri's test suite in rustc's CI is that miri currently contains many features that we want in const eval in the future, and these features would break if the test suite is not run.

fixes #44077

r? @nikomatsakis

cc @eddyb
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/build.rs9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/libstd/build.rs b/src/libstd/build.rs
index ebf07eb0423..19ea25fc7df 100644
--- a/src/libstd/build.rs
+++ b/src/libstd/build.rs
@@ -15,7 +15,7 @@ extern crate gcc;
 
 use std::env;
 use std::process::Command;
-use build_helper::{run, native_lib_boilerplate};
+use build_helper::{run, native_lib_boilerplate, BuildExpectation};
 
 fn main() {
     let target = env::var("TARGET").expect("TARGET was not set");
@@ -97,11 +97,14 @@ fn build_libbacktrace(host: &str, target: &str) -> Result<(), ()> {
                 .env("CC", compiler.path())
                 .env("AR", &ar)
                 .env("RANLIB", format!("{} s", ar.display()))
-                .env("CFLAGS", cflags));
+                .env("CFLAGS", cflags),
+        BuildExpectation::None);
 
     run(Command::new(build_helper::make(host))
                 .current_dir(&native.out_dir)
                 .arg(format!("INCDIR={}", native.src_dir.display()))
-                .arg("-j").arg(env::var("NUM_JOBS").expect("NUM_JOBS was not set")));
+                .arg("-j").arg(env::var("NUM_JOBS").expect("NUM_JOBS was not set")),
+        BuildExpectation::None);
+
     Ok(())
 }