Skip to content

Split up miri into the librustc_mir and bin parts #268

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.

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 19 commits into from
Aug 2, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@ script:
xargo/build.sh
- |
# Test plain miri
cd src/librustc_mir/ && cargo build &&
cargo build &&
cargo test &&
cargo install &&
cd ../..
cargo install
- |
# Test cargo miri
cd cargo-miri-test &&
Expand All @@ -27,7 +26,7 @@ script:
cd ..
- |
# and run all tests with full mir
cd src/librustc_mir/ && MIRI_SYSROOT=~/.xargo/HOST cargo test && cd ../..
MIRI_SYSROOT=~/.xargo/HOST cargo test
notifications:
email:
on_success: never
Expand Down
156 changes: 41 additions & 115 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 37 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[package]
authors = ["Scott Olson <scott@solson.me>"]
description = "An experimental interpreter for Rust MIR."
license = "MIT/Apache-2.0"
name = "miri"
repository = "https://github.com/solson/miri"
version = "0.1.0"

[[bin]]
doc = false
name = "miri"
test = false
path = "miri/bin/miri.rs"

[[bin]]
doc = false
name = "cargo-miri"
test = false
path = "miri/bin/cargo-miri.rs"

[lib]
test = false
path = "miri/lib.rs"

[dependencies]
byteorder = { version = "1.1", features = ["i128"]}
env_logger = "0.4.3"
log = "0.3.6"
log_settings = "0.1.1"
cargo_metadata = "0.2"
rustc_miri = { path = "src/librustc_mir" }

[dev-dependencies]
compiletest_rs = "0.2.6"

[workspace]
exclude = ["xargo", "cargo-miri-test"]
File renamed without changes.
File renamed without changes.
Loading