From 698e7854a463c8538389495d0f0157a6303b425a Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Wed, 11 Jul 2018 21:13:42 +0200
Subject: [PATCH] move tests that no longer need MIR out of fullmir

---
 README.md                                                       | 2 +-
 .../undefined_byte_read.rs                                      | 0
 tests/compiletest.rs                                            | 2 +-
 tests/{run-pass-fullmir => run-pass}/heap.rs                    | 0
 tests/{run-pass-fullmir => run-pass}/issue-15080.rs             | 0
 tests/{run-pass-fullmir => run-pass}/move-arg-2-unique.rs       | 0
 tests/{run-pass-fullmir => run-pass}/regions-mock-trans.rs      | 0
 tests/{run-pass-fullmir => run-pass}/vecs.rs                    | 0
 8 files changed, 2 insertions(+), 2 deletions(-)
 rename tests/{compile-fail-fullmir => compile-fail}/undefined_byte_read.rs (100%)
 rename tests/{run-pass-fullmir => run-pass}/heap.rs (100%)
 rename tests/{run-pass-fullmir => run-pass}/issue-15080.rs (100%)
 rename tests/{run-pass-fullmir => run-pass}/move-arg-2-unique.rs (100%)
 rename tests/{run-pass-fullmir => run-pass}/regions-mock-trans.rs (100%)
 rename tests/{run-pass-fullmir => run-pass}/vecs.rs (100%)

diff --git a/README.md b/README.md
index 7660735a7c..5bd26d61dc 100644
--- a/README.md
+++ b/README.md
@@ -70,7 +70,7 @@ RUSTFLAGS='-Zalways-encode-mir' xargo build
 Now you can run miri against the libstd compiled by xargo:
 
 ```sh
-MIRI_SYSROOT=~/.xargo/HOST cargo run --bin miri tests/run-pass-fullmir/vecs.rs
+MIRI_SYSROOT=~/.xargo/HOST cargo run --bin miri tests/run-pass-fullmir/hashmap.rs
 ```
 
 Notice that you will have to re-run the last step of the preparations above when
diff --git a/tests/compile-fail-fullmir/undefined_byte_read.rs b/tests/compile-fail/undefined_byte_read.rs
similarity index 100%
rename from tests/compile-fail-fullmir/undefined_byte_read.rs
rename to tests/compile-fail/undefined_byte_read.rs
diff --git a/tests/compiletest.rs b/tests/compiletest.rs
index 401499f6c5..d5ed02504a 100644
--- a/tests/compiletest.rs
+++ b/tests/compiletest.rs
@@ -212,5 +212,5 @@ fn compile_fail_miri() {
 
     // FIXME: run tests for other targets, too
     compile_fail(&sysroot, "tests/compile-fail", &host, &host, true);
-    compile_fail(&sysroot, "tests/compile-fail-fullmir", &host, &host, true);
+    //compile_fail(&sysroot, "tests/compile-fail-fullmir", &host, &host, true);
 }
diff --git a/tests/run-pass-fullmir/heap.rs b/tests/run-pass/heap.rs
similarity index 100%
rename from tests/run-pass-fullmir/heap.rs
rename to tests/run-pass/heap.rs
diff --git a/tests/run-pass-fullmir/issue-15080.rs b/tests/run-pass/issue-15080.rs
similarity index 100%
rename from tests/run-pass-fullmir/issue-15080.rs
rename to tests/run-pass/issue-15080.rs
diff --git a/tests/run-pass-fullmir/move-arg-2-unique.rs b/tests/run-pass/move-arg-2-unique.rs
similarity index 100%
rename from tests/run-pass-fullmir/move-arg-2-unique.rs
rename to tests/run-pass/move-arg-2-unique.rs
diff --git a/tests/run-pass-fullmir/regions-mock-trans.rs b/tests/run-pass/regions-mock-trans.rs
similarity index 100%
rename from tests/run-pass-fullmir/regions-mock-trans.rs
rename to tests/run-pass/regions-mock-trans.rs
diff --git a/tests/run-pass-fullmir/vecs.rs b/tests/run-pass/vecs.rs
similarity index 100%
rename from tests/run-pass-fullmir/vecs.rs
rename to tests/run-pass/vecs.rs