Skip to content

Commit d5853bc

Browse files
committed
Auto merge of #2449 - oli-obk:ui_test_subtree_sync, r=RalfJung
Use ui_test from crates.io instead of having it in-tree I have moved a copy of the `ui_test` crate into [a separate repo](https://github.com/oli-obk/ui_test) to facilitate the further non-miri development of it. I will keep syncing until we have reached a point where we don't touch it anymore for miri. At that point we can remove the in-tree version and do further development out of tree.
2 parents d095429 + fb071a1 commit d5853bc

12 files changed

+5
-2290
lines changed

Diff for: Cargo.lock

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ libc = "0.2"
3838

3939
[dev-dependencies]
4040
colored = "2"
41-
ui_test = { path = "ui_test" }
41+
ui_test = "0.1"
4242
# Features chosen to match those required by env_logger, to avoid rebuilds
4343
regex = { version = "1.5.5", default-features = false, features = ["perf", "std"] }
4444
lazy_static = "1.4.0"

Diff for: miri

+1-3
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,8 @@ test|bless)
186186
export MIRI_BLESS="Gesundheit"
187187
fi
188188
# Then test, and let caller control flags.
189-
# Only in root project and ui_test as `cargo-miri` has no tests.
189+
# Only in root project as `cargo-miri` has no tests.
190190
$CARGO test $CARGO_EXTRA_FLAGS --manifest-path "$MIRIDIR"/Cargo.toml "$@"
191-
$CARGO test $CARGO_EXTRA_FLAGS --manifest-path "$MIRIDIR"/ui_test/Cargo.toml "$@"
192191
;;
193192
run)
194193
# Scan for "--target" to overwrite the "MIRI_TEST_TARGET" env var so
@@ -219,7 +218,6 @@ fmt)
219218
;;
220219
clippy)
221220
$CARGO clippy $CARGO_EXTRA_FLAGS --manifest-path "$MIRIDIR"/Cargo.toml --all-targets "$@"
222-
$CARGO clippy $CARGO_EXTRA_FLAGS --manifest-path "$MIRIDIR"/ui_test/Cargo.toml --all-targets "$@"
223221
$CARGO clippy $CARGO_EXTRA_FLAGS --manifest-path "$MIRIDIR"/cargo-miri/Cargo.toml "$@"
224222
;;
225223
cargo)

0 commit comments

Comments
 (0)