Skip to content

Prep miri repository for rustc merger #258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 21, 2017
Merged

Prep miri repository for rustc merger #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand All @@ -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
Expand Down
10 changes: 8 additions & 2 deletions Cargo.toml → src/librustc_mir/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 src/bin/cargo-miri.rs → src/librustc_mir/interpret/bin/cargo-miri.rs
View file
Open in desktop
File renamed without changes.
0 src/bin/miri.rs → src/librustc_mir/interpret/bin/miri.rs
View file
Open in desktop
File renamed without changes.
0 src/cast.rs → src/librustc_mir/interpret/cast.rs
View file
Open in desktop
File renamed without changes.
0 src/const_eval.rs → src/librustc_mir/interpret/const_eval.rs
View file
Open in desktop
File renamed without changes.
0 src/error.rs → src/librustc_mir/interpret/error.rs
View file
Open in desktop
File renamed without changes.
0 src/eval_context.rs → src/librustc_mir/interpret/eval_context.rs
View file
Open in desktop
File renamed without changes.
0 src/lvalue.rs → src/librustc_mir/interpret/lvalue.rs
View file
Open in desktop
File renamed without changes.
0 src/memory.rs → src/librustc_mir/interpret/memory.rs
View file
Open in desktop
File renamed without changes.
0 src/lib.rs → src/librustc_mir/interpret/mod.rs
View file
Open in desktop
File renamed without changes.
0 src/operator.rs → src/librustc_mir/interpret/operator.rs
View file
Open in desktop
File renamed without changes.
0 src/step.rs → src/librustc_mir/interpret/step.rs
View file
Open in desktop
File renamed without changes.
0 src/terminator/drop.rs → ...librustc_mir/interpret/terminator/drop.rs
View file
Open in desktop
File renamed without changes.
0 src/terminator/intrinsic.rs → ...stc_mir/interpret/terminator/intrinsic.rs
View file
Open in desktop
File renamed without changes.
0 src/terminator/mod.rs → src/librustc_mir/interpret/terminator/mod.rs
View file
Open in desktop
File renamed without changes.
0 src/traits.rs → src/librustc_mir/interpret/traits.rs
View file
Open in desktop
File renamed without changes.
0 src/value.rs → src/librustc_mir/interpret/value.rs
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions tests/compiletest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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]
Expand All @@ -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);
}