Merge branch 'master' into coverage-effort

Conflicts: ethcore/res/ethereum/tests
2016-01-31 18:40:59 +04:00
parent 5651192076 122e1ff9ae
commit 5837b6e131
71 changed files with 180 additions and 76 deletions
--- a/util/Cargo.toml
+++ b/util/Cargo.toml
@@ -27,6 +27,4 @@ slab = { git = "https://github.com/arkpar/slab.git" }
 sha3 = { path = "sha3" }
 serde = "0.6.7"
 clippy = "0.0.37"
-
-[dev-dependencies]
 json-tests = { path = "json-tests" }
--- a/util/src/uint.rs
+++ b/util/src/uint.rs
@@ -1217,6 +1217,8 @@ mod tests {

 	#[test]
 	#[should_panic]
+	// overflows panic only in debug builds. Running this test with `--release` flag, always fails
+	#[ignore]
 	pub fn uint128_add_overflow_panic() {
 		U128::from_str("ffffffffffffffffffffffffffffffff").unwrap()
 		+