Prep miri repository for rustc merger

Author: oli-obk

.travis.yml

@@ -15,9 +15,10 @@ script:
   xargo/build.sh
 - |
   # Test plain miri
-  cargo build &&
+  cd src/librustc_mir/ && cargo build &&
   cargo test &&
-  cargo install
+  cargo install &&
+  cd ../..
 - |
   # Test cargo miri
   cd cargo-miri-test &&
@@ -26,7 +27,7 @@ script:
   cd ..
 - |
   # and run all tests with full mir
-  MIRI_SYSROOT=~/.xargo/HOST cargo test
+  cd src/librustc_mir/ && MIRI_SYSROOT=~/.xargo/HOST cargo test && cd ../..
 notifications:
   email:
     on_success: never

Cargo.toml renamed to src/librustc_mir/Cargo.toml

@@ -9,15 +9,22 @@ version = "0.1.0"
 [[bin]]
 doc = false
 name = "miri"
+path = "miri/bin/miri.rs"
 test = false
 
 [[bin]]
 doc = false
 name = "cargo-miri"
+path = "miri/bin/cargo-miri.rs"
 test = false
 
 [lib]
 test = false
+path = "miri/mod.rs"
+
+[[test]]
+name = "compiletest"
+path = "../../tests/compiletest.rs"
 
 [dependencies]
 #byteorder = "0.4.2"

src/bin/cargo-miri.rs renamed to src/librustc_mir/miri/bin/cargo-miri.rs

@@ -48,7 +48,7 @@ fn miri_pass(path: &str, target: &str, host: &str, fullmir: bool) {
     config.src_base = PathBuf::from(path);
     config.target = target.to_owned();
     config.host = host.to_owned();
-    config.rustc_path = PathBuf::from("target/debug/miri");
+    config.rustc_path = "target/debug/miri".into();
     if fullmir {
         if host != target {
             // skip fullmir on nonhost
@@ -216,14 +216,14 @@ fn compile_test() {
 
         panic!("ran miri on rustc test suite. Test failing for convenience");
     } else {
-        run_pass("tests/run-pass");
-        run_pass("tests/run-pass-fullmir");
+        run_pass("../../tests/run-pass");
+        run_pass("../../tests/run-pass-fullmir");
         for_all_targets(sysroot, |target| {
-            miri_pass("tests/run-pass", &target, host, false);
-            compile_fail(sysroot, "tests/compile-fail", &target, host, false);
+            miri_pass("../../tests/run-pass", &target, host, false);
+            compile_fail(sysroot, "../../tests/compile-fail", &target, host, false);
         });
-        miri_pass("tests/run-pass-fullmir", host, host, true);
-        compile_fail(sysroot, "tests/compile-fail-fullmir", host, host, true);
+        miri_pass("../../tests/run-pass-fullmir", host, host, true);
+        compile_fail(sysroot, "../../tests/compile-fail-fullmir", host, host, true);
     }
 }