Merge pull request #258 from oli-obk/upstream

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,19 +9,25 @@ version = "0.1.0"
 [[bin]]
 doc = false
 name = "miri"
+path = "interpret/bin/miri.rs"
 test = false
 
 [[bin]]
 doc = false
 name = "cargo-miri"
+path = "interpret/bin/cargo-miri.rs"
 test = false
 
 [lib]
 test = false
+path = "interpret/mod.rs"
+
+[[test]]
+name = "compiletest"
+path = "../../tests/compiletest.rs"
 
 [dependencies]
-#byteorder = "0.4.2"
-byteorder = { git = "https://github.com/BurntSushi/byteorder", features = ["i128"]}
+byteorder = { version = "1.1", features = ["i128"]}
 env_logger = "0.3.3"
 log = "0.3.6"
 log_settings = "0.1.1"

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

@@ -56,7 +56,7 @@ fn miri_pass(path: &str, target: &str, host: &str, fullmir: bool, opt: 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();
     let mut flags = Vec::new();
     if fullmir {
         if host != target {
@@ -130,16 +130,16 @@ fn run_pass_miri() {
 
     for &opt in [false, true].iter() {
         for_all_targets(&sysroot, |target| {
-            miri_pass("tests/run-pass", &target, &host, false, opt);
+            miri_pass("../../tests/run-pass", &target, &host, false, opt);
         });
-        miri_pass("tests/run-pass-fullmir", &host, &host, true, opt);
+        miri_pass("../../tests/run-pass-fullmir", &host, &host, true, opt);
     }
 }
 
 #[test]
 fn run_pass_rustc() {
-    run_pass("tests/run-pass");
-    run_pass("tests/run-pass-fullmir");
+    run_pass("../../tests/run-pass");
+    run_pass("../../tests/run-pass-fullmir");
 }
 
 #[test]
@@ -148,7 +148,7 @@ fn compile_fail_miri() {
     let host = get_host();
 
     for_all_targets(&sysroot, |target| {
-        compile_fail(&sysroot, "tests/compile-fail", &target, &host, false);
+        compile_fail(&sysroot, "../../tests/compile-fail", &target, &host, false);
     });
-    compile_fail(&sysroot, "tests/compile-fail-fullmir", &host, &host, true);
+    compile_fail(&sysroot, "../../tests/compile-fail-fullmir", &host, &host, true);
 }