Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 232260b

Browse files
committed
Auto merge of rust-lang#2176 - RalfJung:test-dirs, r=oli-obk
rename test suite directories Fixes rust-lang/miri#2154
2 parents 749efd2 + 3d634c9 commit 232260b

File tree

979 files changed

+4
-4
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

979 files changed

+4
-4
lines changed

ci.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function run_tests {
2626
# optimizations up all the way).
2727
# Optimizations change diagnostics (mostly backtraces), so we don't check them
2828
#FIXME(#2155): we want to only run the pass and panic tests here, not the fail tests.
29-
MIRIFLAGS="-O -Zmir-opt-level=4" MIRI_SKIP_UI_CHECKS=1 ./miri test --locked -- tests/{run-pass,run-fail}
29+
MIRIFLAGS="-O -Zmir-opt-level=4" MIRI_SKIP_UI_CHECKS=1 ./miri test --locked -- tests/{pass,panic}
3030
fi
3131

3232
# On Windows, there is always "python", not "python3" or "python2".

tests/compiletest.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ fn main() {
132132
// Let the tests know where to store temp files (they might run for a different target, which can make this hard to find).
133133
env::set_var("MIRI_TEMP", env::temp_dir());
134134

135-
ui(Mode::Pass, "tests/run-pass");
136-
ui(Mode::Panic, "tests/run-fail");
137-
ui(Mode::Fail, "tests/compile-fail");
135+
ui(Mode::Pass, "tests/pass");
136+
ui(Mode::Panic, "tests/panic");
137+
ui(Mode::Fail, "tests/fail");
138138
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)