Skip to content

Commit 6db96de

Browse files
committed
Auto merge of rust-lang#120264 - weihanglo:split-dward-kind-lto, r=michaelwoerister
test: enable `unpacked-lto` tests This enables the correct `unpacked-lto` tests. Not sure whether `.o` should be removed. They are bitcode for linker-plugin-lto, though there might be some `.o` for `#[no_builtins]`?
2 parents b0696a5 + 39e8512 commit 6db96de

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Diff for: tests/run-make/split-debuginfo/Makefile

+5-5
Original file line numberDiff line numberDiff line change
@@ -234,28 +234,28 @@ unpacked-single:
234234
ls $(TMPDIR)/*.dwp && exit 1 || exit 0
235235
rm $(TMPDIR)/$(call BIN,foo)
236236

237-
unpacked-lto: packed-lto-split packed-lto-single
237+
unpacked-lto: unpacked-lto-split unpacked-lto-single
238238

239239
# - rmeta file added to rlib, no object files are generated and thus no debuginfo is generated
240-
# - `.o` never created
240+
# - `.o` present (bitcode)
241241
# - `.dwo` never created
242242
# - `.dwp` never created
243243
unpacked-lto-split:
244244
$(RUSTC) baz.rs -g $(UNSTABLEOPTS) -Csplit-debuginfo=unpacked -Zsplit-dwarf-kind=split \
245245
--crate-type=rlib -Clinker-plugin-lto
246-
ls $(TMPDIR)/*.o && exit 1 || exit 0
246+
rm $(TMPDIR)/*.o
247247
ls $(TMPDIR)/*.dwo && exit 1 || exit 0
248248
ls $(TMPDIR)/*.dwp && exit 1 || exit 0
249249
rm $(TMPDIR)/libbaz.rlib
250250

251251
# - rmeta file added to rlib, no object files are generated and thus no debuginfo is generated
252-
# - `.o` never created
252+
# - `.o` present (bitcode)
253253
# - `.dwo` never created
254254
# - `.dwp` never created
255255
unpacked-lto-single:
256256
$(RUSTC) baz.rs -g $(UNSTABLEOPTS) -Csplit-debuginfo=unpacked -Zsplit-dwarf-kind=single \
257257
--crate-type=rlib -Clinker-plugin-lto
258-
ls $(TMPDIR)/*.o && exit 1 || exit 0
258+
rm $(TMPDIR)/*.o
259259
ls $(TMPDIR)/*.dwo && exit 1 || exit 0
260260
ls $(TMPDIR)/*.dwp && exit 1 || exit 0
261261
rm $(TMPDIR)/libbaz.rlib

0 commit comments

Comments
 (0)