Move type-mismatch test to cargo-kani suite (rust-lang#818)

Test no longer needs special handling.
celinval · Feb 10, 2022 · d78a8d0 · d78a8d0
1 parent 0d43444
commit d78a8d0
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 39 deletions.
diff --git a/scripts/kani-regression.sh b/scripts/kani-regression.sh
@@ -89,9 +89,6 @@ time "$SCRIPT_DIR"/codegen-firecracker.sh
 #         dependency2
 time "$KANI_DIR"/tests/kani-dependency-test/diamond-dependency/run-dependency-test.sh
 
-# Check that we don't have type mismatches across different crates
-time "$KANI_DIR"/tests/kani-multicrate/type-mismatch/run-mismatch-test.sh
-
 echo
 echo "All Kani regression tests completed successfully."
 echo
diff --git a/...ticrate/type-mismatch/mismatch/Cargo.toml → tests/cargo-kani/type-mismatch/Cargo.toml b/...ticrate/type-mismatch/mismatch/Cargo.toml → tests/cargo-kani/type-mismatch/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-uses_core = { path = "../uses_core" }
-uses_std = { path = "../uses_std" }
+uses_core = { path = "uses_core" }
+uses_std = { path = "uses_std" }
 
 [workspace]
diff --git a/...ticrate/type-mismatch/mismatch/src/lib.rs → tests/cargo-kani/type-mismatch/src/lib.rs b/...ticrate/type-mismatch/mismatch/src/lib.rs → tests/cargo-kani/type-mismatch/src/lib.rs
diff --git a/...icrate/type-mismatch/uses_core/Cargo.toml → ...o-kani/type-mismatch/uses_core/Cargo.toml b/...icrate/type-mismatch/uses_core/Cargo.toml → ...o-kani/type-mismatch/uses_core/Cargo.toml
diff --git a/...icrate/type-mismatch/uses_core/src/lib.rs → ...o-kani/type-mismatch/uses_core/src/lib.rs b/...icrate/type-mismatch/uses_core/src/lib.rs → ...o-kani/type-mismatch/uses_core/src/lib.rs
diff --git a/...ticrate/type-mismatch/uses_std/Cargo.toml → ...go-kani/type-mismatch/uses_std/Cargo.toml b/...ticrate/type-mismatch/uses_std/Cargo.toml → ...go-kani/type-mismatch/uses_std/Cargo.toml
diff --git a/...ticrate/type-mismatch/uses_std/src/lib.rs → ...go-kani/type-mismatch/uses_std/src/lib.rs b/...ticrate/type-mismatch/uses_std/src/lib.rs → ...go-kani/type-mismatch/uses_std/src/lib.rs
diff --git a/tests/kani-multicrate/type-mismatch/run-mismatch-test.sh b/tests/kani-multicrate/type-mismatch/run-mismatch-test.sh