Skip to content

Commit 4e47bd0

Browse files
albertlarsan68albertlarsan68
committed
Change src/test to tests in source files, fix tidy and tests
1 parent 928d656 commit 4e47bd0

File tree

1 file changed

+66
-66
lines changed

1 file changed

+66
-66
lines changed

‎scripts/test_rustc_tests.sh

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -10,118 +10,118 @@ pushd rust
1010

1111
command -v rg >/dev/null 2>&1 || cargo install ripgrep
1212

13-
rm -r src/test/ui/{extern/,unsized-locals/,lto/,linkage*} || true
14-
for test in $(rg --files-with-matches "lto|// needs-asm-support|// needs-unwind" src/test/{ui,incremental}); do
13+
rm -r tests/ui/{extern/,unsized-locals/,lto/,linkage*} || true
14+
for test in $(rg --files-with-matches "lto|// needs-asm-support|// needs-unwind" tests/{ui,incremental}); do
1515
rm $test
1616
done
1717

18-
for test in $(rg -i --files-with-matches "//(\[\w+\])?~[^\|]*\s*ERR|// error-pattern:|// build-fail|// run-fail|-Cllvm-args" src/test/ui); do
18+
for test in $(rg -i --files-with-matches "//(\[\w+\])?~[^\|]*\s*ERR|// error-pattern:|// build-fail|// run-fail|-Cllvm-args" tests/ui); do
1919
rm $test
2020
done
2121

22-
git checkout -- src/test/ui/issues/auxiliary/issue-3136-a.rs # contains //~ERROR, but shouldn't be removed
23-
git checkout -- src/test/ui/proc-macro/pretty-print-hack/
22+
git checkout -- tests/ui/issues/auxiliary/issue-3136-a.rs # contains //~ERROR, but shouldn't be removed
23+
git checkout -- tests/ui/proc-macro/pretty-print-hack/
2424

2525
# missing features
2626
# ================
2727

2828
# requires stack unwinding
29-
rm src/test/incremental/change_crate_dep_kind.rs
30-
rm src/test/incremental/issue-80691-bad-eval-cache.rs # -Cpanic=abort causes abort instead of exit(101)
29+
rm tests/incremental/change_crate_dep_kind.rs
30+
rm tests/incremental/issue-80691-bad-eval-cache.rs # -Cpanic=abort causes abort instead of exit(101)
3131

3232
# requires compiling with -Cpanic=unwind
33-
rm -r src/test/ui/macros/rfc-2011-nicer-assert-messages/
34-
rm -r src/test/run-make/test-benches
33+
rm -r tests/ui/macros/rfc-2011-nicer-assert-messages/
34+
rm -r tests/run-make/test-benches
3535

3636
# vendor intrinsics
37-
rm src/test/ui/sse2.rs # cpuid not supported, so sse2 not detected
38-
rm src/test/ui/intrinsics/const-eval-select-x86_64.rs # requires x86_64 vendor intrinsics
39-
rm src/test/ui/simd/array-type.rs # "Index argument for `simd_insert` is not a constant"
40-
rm src/test/ui/simd/intrinsic/generic-bitmask-pass.rs # simd_bitmask unimplemented
41-
rm src/test/ui/simd/intrinsic/generic-as.rs # simd_as unimplemented
42-
rm src/test/ui/simd/intrinsic/generic-arithmetic-saturating-pass.rs # simd_saturating_add unimplemented
43-
rm src/test/ui/simd/intrinsic/float-math-pass.rs # simd_fcos unimplemented
44-
rm src/test/ui/simd/intrinsic/generic-gather-pass.rs # simd_gather unimplemented
45-
rm src/test/ui/simd/intrinsic/generic-select-pass.rs # simd_select_bitmask unimplemented
46-
rm src/test/ui/simd/issue-85915-simd-ptrs.rs # simd_gather unimplemented
47-
rm src/test/ui/simd/issue-89193.rs # simd_gather unimplemented
48-
rm src/test/ui/simd/simd-bitmask.rs # simd_bitmask unimplemented
37+
rm tests/ui/sse2.rs # cpuid not supported, so sse2 not detected
38+
rm tests/ui/intrinsics/const-eval-select-x86_64.rs # requires x86_64 vendor intrinsics
39+
rm tests/ui/simd/array-type.rs # "Index argument for `simd_insert` is not a constant"
40+
rm tests/ui/simd/intrinsic/generic-bitmask-pass.rs # simd_bitmask unimplemented
41+
rm tests/ui/simd/intrinsic/generic-as.rs # simd_as unimplemented
42+
rm tests/ui/simd/intrinsic/generic-arithmetic-saturating-pass.rs # simd_saturating_add unimplemented
43+
rm tests/ui/simd/intrinsic/float-math-pass.rs # simd_fcos unimplemented
44+
rm tests/ui/simd/intrinsic/generic-gather-pass.rs # simd_gather unimplemented
45+
rm tests/ui/simd/intrinsic/generic-select-pass.rs # simd_select_bitmask unimplemented
46+
rm tests/ui/simd/issue-85915-simd-ptrs.rs # simd_gather unimplemented
47+
rm tests/ui/simd/issue-89193.rs # simd_gather unimplemented
48+
rm tests/ui/simd/simd-bitmask.rs # simd_bitmask unimplemented
4949

5050
# exotic linkages
51-
rm src/test/ui/issues/issue-33992.rs # unsupported linkages
52-
rm src/test/incremental/hashes/function_interfaces.rs # same
53-
rm src/test/incremental/hashes/statics.rs # same
51+
rm tests/ui/issues/issue-33992.rs # unsupported linkages
52+
rm tests/incremental/hashes/function_interfaces.rs # same
53+
rm tests/incremental/hashes/statics.rs # same
5454

5555
# variadic arguments
56-
rm src/test/ui/abi/mir/mir_codegen_calls_variadic.rs # requires float varargs
57-
rm src/test/ui/abi/variadic-ffi.rs # requires callee side vararg support
56+
rm tests/ui/abi/mir/mir_codegen_calls_variadic.rs # requires float varargs
57+
rm tests/ui/abi/variadic-ffi.rs # requires callee side vararg support
5858

5959
# unsized locals
60-
rm -r src/test/run-pass-valgrind/unsized-locals
60+
rm -r tests/run-pass-valgrind/unsized-locals
6161

6262
# misc unimplemented things
63-
rm src/test/ui/intrinsics/intrinsic-nearby.rs # unimplemented nearbyintf32 and nearbyintf64 intrinsics
64-
rm src/test/ui/target-feature/missing-plusminus.rs # error not implemented
65-
rm src/test/ui/fn/dyn-fn-alignment.rs # wants a 256 byte alignment
66-
rm -r src/test/run-make/emit-named-files # requires full --emit support
67-
rm src/test/ui/abi/stack-probes.rs # stack probes not yet implemented
68-
rm src/test/ui/simd/intrinsic/ptr-cast.rs # simd_expose_addr intrinsic unimplemented
69-
rm -r src/test/run-make/repr128-dwarf # debuginfo test
70-
rm src/test/codegen-units/item-collection/asm-sym.rs # requires support for sym in asm!()
63+
rm tests/ui/intrinsics/intrinsic-nearby.rs # unimplemented nearbyintf32 and nearbyintf64 intrinsics
64+
rm tests/ui/target-feature/missing-plusminus.rs # error not implemented
65+
rm tests/ui/fn/dyn-fn-alignment.rs # wants a 256 byte alignment
66+
rm -r tests/run-make/emit-named-files # requires full --emit support
67+
rm tests/ui/abi/stack-probes.rs # stack probes not yet implemented
68+
rm tests/ui/simd/intrinsic/ptr-cast.rs # simd_expose_addr intrinsic unimplemented
69+
rm -r tests/run-make/repr128-dwarf # debuginfo test
70+
rm tests/codegen-units/item-collection/asm-sym.rs # requires support for sym in asm!()
7171

7272
# optimization tests
7373
# ==================
74-
rm src/test/ui/codegen/issue-28950.rs # depends on stack size optimizations
75-
rm src/test/ui/codegen/init-large-type.rs # same
76-
rm src/test/ui/issues/issue-40883.rs # same
77-
rm -r src/test/run-make/fmt-write-bloat/ # tests an optimization
74+
rm tests/ui/codegen/issue-28950.rs # depends on stack size optimizations
75+
rm tests/ui/codegen/init-large-type.rs # same
76+
rm tests/ui/issues/issue-40883.rs # same
77+
rm -r tests/run-make/fmt-write-bloat/ # tests an optimization
7878

7979
# backend specific tests
8080
# ======================
81-
rm src/test/incremental/thinlto/cgu_invalidated_when_import_{added,removed}.rs # requires LLVM
82-
rm src/test/ui/abi/stack-protector.rs # requires stack protector support
81+
rm tests/incremental/thinlto/cgu_invalidated_when_import_{added,removed}.rs # requires LLVM
82+
rm tests/ui/abi/stack-protector.rs # requires stack protector support
8383

8484
# giving different but possibly correct results
8585
# =============================================
86-
rm src/test/ui/mir/mir_misc_casts.rs # depends on deduplication of constants
87-
rm src/test/ui/mir/mir_raw_fat_ptr.rs # same
88-
rm src/test/ui/consts/issue-33537.rs # same
89-
rm src/test/ui/layout/valid_range_oob.rs # different ICE message
86+
rm tests/ui/mir/mir_misc_casts.rs # depends on deduplication of constants
87+
rm tests/ui/mir/mir_raw_fat_ptr.rs # same
88+
rm tests/ui/consts/issue-33537.rs # same
89+
rm tests/ui/layout/valid_range_oob.rs # different ICE message
9090

9191
# doesn't work due to the way the rustc test suite is invoked.
9292
# should work when using ./x.py test the way it is intended
9393
# ============================================================
94-
rm -r src/test/run-make/emit-shared-files # requires the rustdoc executable in dist/bin/
95-
rm -r src/test/run-make/unstable-flag-required # same
96-
rm -r src/test/run-make/rustdoc-* # same
97-
rm -r src/test/run-make/issue-88756-default-output # same
98-
rm -r src/test/run-make/remap-path-prefix-dwarf # requires llvm-dwarfdump
99-
rm -r src/test/ui/consts/missing_span_in_backtrace.rs # expects sysroot source to be elsewhere
94+
rm -r tests/run-make/emit-shared-files # requires the rustdoc executable in dist/bin/
95+
rm -r tests/run-make/unstable-flag-required # same
96+
rm -r tests/run-make/rustdoc-* # same
97+
rm -r tests/run-make/issue-88756-default-output # same
98+
rm -r tests/run-make/remap-path-prefix-dwarf # requires llvm-dwarfdump
99+
rm -r tests/ui/consts/missing_span_in_backtrace.rs # expects sysroot source to be elsewhere
100100

101101
# genuine bugs
102102
# ============
103-
rm src/test/incremental/spike-neg1.rs # errors out for some reason
104-
rm src/test/incremental/spike-neg2.rs # same
105-
rm src/test/ui/issues/issue-74564-if-expr-stack-overflow.rs # gives a stackoverflow before the backend runs
106-
rm src/test/ui/mir/ssa-analysis-regression-50041.rs # produces ICE
107-
rm src/test/ui/type-alias-impl-trait/assoc-projection-ice.rs # produces ICE
103+
rm tests/incremental/spike-neg1.rs # errors out for some reason
104+
rm tests/incremental/spike-neg2.rs # same
105+
rm tests/ui/issues/issue-74564-if-expr-stack-overflow.rs # gives a stackoverflow before the backend runs
106+
rm tests/ui/mir/ssa-analysis-regression-50041.rs # produces ICE
107+
rm tests/ui/type-alias-impl-trait/assoc-projection-ice.rs # produces ICE
108108

109-
rm src/test/ui/simd/intrinsic/generic-reduction-pass.rs # simd_reduce_add_unordered doesn't accept an accumulator for integer vectors
109+
rm tests/ui/simd/intrinsic/generic-reduction-pass.rs # simd_reduce_add_unordered doesn't accept an accumulator for integer vectors
110110

111-
rm src/test/ui/runtime/out-of-stack.rs # SIGSEGV instead of SIGABRT for some reason (#1301)
111+
rm tests/ui/runtime/out-of-stack.rs # SIGSEGV instead of SIGABRT for some reason (#1301)
112112

113113
# bugs in the test suite
114114
# ======================
115-
rm src/test/ui/backtrace.rs # TODO warning
116-
rm src/test/ui/simple_global_asm.rs # TODO add needs-asm-support
117-
rm src/test/ui/test-attrs/test-type.rs # TODO panic message on stderr. correct stdout
115+
rm tests/ui/backtrace.rs # TODO warning
116+
rm tests/ui/simple_global_asm.rs # TODO add needs-asm-support
117+
rm tests/ui/test-attrs/test-type.rs # TODO panic message on stderr. correct stdout
118118
# not sure if this is actually a bug in the test suite, but the symbol list shows the function without leading _ for some reason
119-
rm -r src/test/run-make/native-link-modifier-bundle
120-
rm src/test/ui/process/nofile-limit.rs # TODO some AArch64 linking issue
121-
rm src/test/ui/dyn-star/dispatch-on-pin-mut.rs # TODO failed assertion in vtable::get_ptr_and_method_ref
119+
rm -r tests/run-make/native-link-modifier-bundle
120+
rm tests/ui/process/nofile-limit.rs # TODO some AArch64 linking issue
121+
rm tests/ui/dyn-star/dispatch-on-pin-mut.rs # TODO failed assertion in vtable::get_ptr_and_method_ref
122122

123-
rm src/test/ui/stdio-is-blocking.rs # really slow with unoptimized libstd
123+
rm tests/ui/stdio-is-blocking.rs # really slow with unoptimized libstd
124124

125125
echo "[TEST] rustc test suite"
126-
RUST_TEST_NOCAPTURE=1 COMPILETEST_FORCE_STAGE0=1 ./x.py test --stage 0 src/test/{codegen-units,run-make,run-pass-valgrind,ui,incremental}
126+
RUST_TEST_NOCAPTURE=1 COMPILETEST_FORCE_STAGE0=1 ./x.py test --stage 0 tests/{codegen-units,run-make,run-pass-valgrind,ui,incremental}
127127
popd

0 commit comments

Comments
 (0)