@@ -10,14 +10,6 @@ pushd rust
1010
1111command -v rg > /dev/null 2>&1 || cargo install ripgrep
1212
13- # FIXME(rust-lang/rust#122196) fix stage0 rmake.rs run-make tests and remove
14- # this workaround
15- for test in $( ls tests/run-make) ; do
16- if [[ -e " tests/run-make/$test /rmake.rs" ; then
17- rm -r " tests/run-make/$test "
18- fi
19- done
20-
2113# FIXME remove this workaround once ICE tests no longer emit an outdated nightly message
2214for test in $( rg -i --files-with-matches " //@(\[.*\])? failure-status: 101" ) ; do
2315 echo " rm $test "
@@ -42,7 +34,6 @@ rm tests/ui/parser/unclosed-delimiter-in-dep.rs # submodule contains //~ERROR
4234# ================
4335
4436# vendor intrinsics
45- rm tests/ui/simd/array-type.rs # "Index argument for `simd_insert` is not a constant"
4637rm tests/ui/asm/x86_64/evex512-implicit-feature.rs # unimplemented AVX512 x86 vendor intrinsic
4738
4839# exotic linkages
@@ -59,12 +50,9 @@ rm -r tests/run-make/c-link-to-rust-va-list-fn # requires callee side vararg sup
5950rm -r tests/run-pass-valgrind/unsized-locals
6051
6152# misc unimplemented things
62- rm tests/ui/intrinsics/intrinsic-nearby.rs # unimplemented nearbyintf32 and nearbyintf64 intrinsics
6353rm tests/ui/target-feature/missing-plusminus.rs # error not implemented
64- rm -r tests/run-make/emit-named-files # requires full --emit support
6554rm -r tests/run-make/repr128-dwarf # debuginfo test
6655rm -r tests/run-make/split-debuginfo # same
67- rm -r tests/run-make/symbols-include-type-name # --emit=asm not supported
6856rm -r tests/run-make/target-specs # i686 not supported by Cranelift
6957rm -r tests/run-make/mismatching-target-triples # same
7058rm tests/ui/asm/x86_64/issue-96797.rs # const and sym inline asm operands don't work entirely correctly
@@ -102,42 +90,39 @@ rm tests/ui/abi/stack-protector.rs # requires stack protector support
10290rm -r tests/run-make/emit-stack-sizes # requires support for -Z emit-stack-sizes
10391rm -r tests/run-make/optimization-remarks-dir # remarks are LLVM specific
10492
93+ # requires asm, llvm-ir and/or llvm-bc emit support
94+ # =============================================
95+ rm -r tests/run-make/emit-named-files
96+ rm -r tests/run-make/issue-30063
97+ rm -r tests/run-make/multiple-emits
98+ rm -r tests/run-make/output-type-permutations
99+ rm -r tests/run-make/emit-to-stdout
100+ rm -r tests/run-make/compressed-debuginfo
101+ rm -r tests/run-make/symbols-include-type-name
102+
103+
105104# giving different but possibly correct results
106105# =============================================
107106rm tests/ui/mir/mir_misc_casts.rs # depends on deduplication of constants
108107rm tests/ui/mir/mir_raw_fat_ptr.rs # same
109108rm tests/ui/consts/issue-33537.rs # same
110109rm tests/ui/consts/const-mut-refs-crate.rs # same
111110
112- # rustdoc-clif passes extra args, suppressing the help message when no args are passed
113- rm -r tests/run-make/issue-88756-default-output
114-
115111# doesn't work due to the way the rustc test suite is invoked.
116112# should work when using ./x.py test the way it is intended
117113# ============================================================
118114rm -r tests/run-make/remap-path-prefix-dwarf # requires llvm-dwarfdump
115+ rm -r tests/run-make/compiler-builtins # Expects lib/rustlib/src/rust to contains the standard library source
119116
120117# genuine bugs
121118# ============
122119rm tests/incremental/spike-neg1.rs # errors out for some reason
123120rm tests/incremental/spike-neg2.rs # same
124-
125- rm -r tests/run-make/issue-51671 # wrong filename given in case of --emit=obj
126- rm -r tests/run-make/issue-30063 # same
127- rm -r tests/run-make/multiple-emits # same
128- rm -r tests/run-make/output-type-permutations # same
129- rm -r tests/run-make/used # same
130- rm -r tests/run-make/no-alloc-shim
131- rm -r tests/run-make/emit-to-stdout
132- rm -r tests/run-make/compressed-debuginfo
133-
134121rm -r tests/run-make/extern-fn-explicit-align # argument alignment not yet supported
135-
136- rm tests/ui/codegen/subtyping-enforces-type-equality.rs # assert_assignable bug with Coroutine's
122+ rm -r tests/run-make/panic-abort-eh_frame # .eh_frame emitted with panic=abort
137123
138124# bugs in the test suite
139125# ======================
140- rm tests/ui/backtrace.rs # TODO warning
141126rm tests/ui/process/nofile-limit.rs # TODO some AArch64 linking issue
142127
143128rm tests/ui/stdio-is-blocking.rs # really slow with unoptimized libstd
@@ -160,6 +145,19 @@ index ea06b620c4c..b969d0009c6 100644
160145 ifdef RUSTC_LINKER
161146 RUSTC := \$ (RUSTC) -Clinker='\$ (RUSTC_LINKER)'
162147 RUSTDOC := \$ (RUSTDOC) -Clinker='\$ (RUSTC_LINKER)'
148+ diff --git a/src/tools/run-make-support/src/rustdoc.rs b/src/tools/run-make-support/src/rustdoc.rs
149+ index 9607ff02f96..b7d97caf9a2 100644
150+ --- a/src/tools/run-make-support/src/rustdoc.rs
151+ +++ b/src/tools/run-make-support/src/rustdoc.rs
152+ @@ -34,8 +34,6 @@ pub fn bare() -> Self {
153+ /// Construct a \` rustdoc\` invocation with \` -L \$ (TARGET_RPATH_DIR)\` set.
154+ pub fn new() -> Self {
155+ let mut cmd = setup_common();
156+ - let target_rpath_dir = env::var_os("TARGET_RPATH_DIR").unwrap();
157+ - cmd.arg(format!("-L{}", target_rpath_dir.to_string_lossy()));
158+ Self { cmd }
159+ }
160+
163161EOF
164162
165163echo " [TEST] rustc test suite"
0 commit comments