about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2017-08-02 11:31:53 -0700
committerRalf Jung <post@ralfj.de>2017-08-03 18:13:23 -0700
commit9458111681490cf8fcf1d7768f82a34ea9a89f4c (patch)
tree9dbab73660c7170e9fa04c483da74f4823aa1f91
parent58a17026c996f8f759b775a0582d50f9130ab0f6 (diff)
downloadrust-9458111681490cf8fcf1d7768f82a34ea9a89f4c.tar.gz
rust-9458111681490cf8fcf1d7768f82a34ea9a89f4c.zip
for now, disable validation on optimized tests -- inlining breaks validation
-rw-r--r--tests/compiletest.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/compiletest.rs b/tests/compiletest.rs
index 5fc1a5010f0..7d1829adb5a 100644
--- a/tests/compiletest.rs
+++ b/tests/compiletest.rs
@@ -75,8 +75,9 @@ fn miri_pass(path: &str, target: &str, host: &str, fullmir: bool, opt: bool) {
         flags.push("-Zmir-opt-level=3".to_owned());
     } else {
         flags.push("-Zmir-opt-level=0".to_owned());
+        // For now, only validate without optimizations.  Inlining breaks validation.
+        flags.push("-Zmir-emit-validate=1".to_owned());
     }
-    flags.push("-Zmir-emit-validate=1".to_owned());
     config.target_rustcflags = Some(flags.join(" "));
     // don't actually execute the final binary, it might be for other targets and we only care
     // about running miri, not the binary.