Skip to content

Commit 95ba76b

Browse files
jieyouxujieyouxu
committed
tests: remove redundant -C debuginfo=2 when -g is already specified
`-g` is an alias for `-C debuginfo=2`.
1 parent 97ae7a0 commit 95ba76b

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

‎tests/run-make/split-debuginfo/Makefile

+24-24
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ else # Some non-Windows, non-Darwin platforms are not stable, and some are.
112112
# - `.dwo` deleted
113113
# - `.dwp` present
114114
packed-remapped-split:
115-
$(RUSTC) $(UNSTABLEOPTS) -C split-debuginfo=packed -C debuginfo=2 \
116-
-Z split-dwarf-kind=split --remap-path-prefix $(TMPDIR)=/a foo.rs -g
115+
$(RUSTC) $(UNSTABLEOPTS) -C split-debuginfo=packed -g \
116+
-Z split-dwarf-kind=split --remap-path-prefix $(TMPDIR)=/a foo.rs
117117
objdump -Wi $(TMPDIR)/foo | grep DW_AT_GNU_dwo_name | (! grep $(TMPDIR)) || exit 1
118118
ls $(TMPDIR)/*.o && exit 1 || exit 0
119119
ls $(TMPDIR)/*.dwo && exit 1 || exit 0
@@ -126,8 +126,8 @@ else # Some non-Windows, non-Darwin platforms are not stable, and some are.
126126
# - `.dwo` never created
127127
# - `.dwp` present
128128
packed-remapped-single:
129-
$(RUSTC) $(UNSTABLEOPTS) -C split-debuginfo=packed -C debuginfo=2 \
130-
-Z split-dwarf-kind=single --remap-path-prefix $(TMPDIR)=/a foo.rs -g
129+
$(RUSTC) $(UNSTABLEOPTS) -C split-debuginfo=packed -g \
130+
-Z split-dwarf-kind=single --remap-path-prefix $(TMPDIR)=/a foo.rs
131131
objdump -Wi $(TMPDIR)/foo | grep DW_AT_GNU_dwo_name | (! grep $(TMPDIR)) || exit 1
132132
ls $(TMPDIR)/*.o && exit 1 || exit 0
133133
ls $(TMPDIR)/*.dwo && exit 1 || exit 0
@@ -140,9 +140,9 @@ else # Some non-Windows, non-Darwin platforms are not stable, and some are.
140140
# - `.dwo` never created
141141
# - `.dwp` present
142142
packed-remapped-scope:
143-
$(RUSTC) $(UNSTABLEOPTS) -C split-debuginfo=packed -C debuginfo=2 \
143+
$(RUSTC) $(UNSTABLEOPTS) -C split-debuginfo=packed -g \
144144
-Z split-dwarf-kind=single --remap-path-prefix $(TMPDIR)=/a \
145-
-Z remap-path-scope=debuginfo foo.rs -g
145+
-Z remap-path-scope=debuginfo foo.rs
146146
objdump -Wi $(TMPDIR)/foo | grep DW_AT_GNU_dwo_name | (! grep $(TMPDIR)) || exit 1
147147
ls $(TMPDIR)/*.o && exit 1 || exit 0
148148
ls $(TMPDIR)/*.dwo && exit 1 || exit 0
@@ -155,9 +155,9 @@ else # Some non-Windows, non-Darwin platforms are not stable, and some are.
155155
# - `.dwo` never created
156156
# - `.dwp` present
157157
packed-remapped-wrong-scope:
158-
$(RUSTC) $(UNSTABLEOPTS) -C split-debuginfo=packed -C debuginfo=2 \
158+
$(RUSTC) $(UNSTABLEOPTS) -C split-debuginfo=packed -g \
159159
-Z split-dwarf-kind=single --remap-path-prefix $(TMPDIR)=/a \
160-
-Z remap-path-scope=macro foo.rs -g
160+
-Z remap-path-scope=macro foo.rs
161161
objdump -Wi $(TMPDIR)/foo | grep DW_AT_GNU_dwo_name | (grep $(TMPDIR)) || exit 1
162162
ls $(TMPDIR)/*.o && exit 1 || exit 0
163163
ls $(TMPDIR)/*.dwo && exit 1 || exit 0
@@ -176,13 +176,13 @@ else # Some non-Windows, non-Darwin platforms are not stable, and some are.
176176
# - (main) `.dwp` present
177177
packed-crosscrate-split:
178178
$(RUSTC) --crate-type lib $(UNSTABLEOPTS) -C split-debuginfo=packed \
179-
-Zsplit-dwarf-kind=split -C debuginfo=2 -g bar.rs
179+
-Zsplit-dwarf-kind=split -g bar.rs
180180
ls $(TMPDIR)/*.rlib
181181
ls $(TMPDIR)/*.o && exit 1 || exit 0
182182
ls $(TMPDIR)/*.dwo && exit 1 || exit 0
183183
ls $(TMPDIR)/*.dwp && exit 1 || exit 0
184184
$(RUSTC) --extern bar=$(TMPDIR)/libbar.rlib $(UNSTABLEOPTS) \
185-
-C split-debuginfo=packed -Zsplit-dwarf-kind=split -C debuginfo=2 -g main.rs
185+
-C split-debuginfo=packed -Zsplit-dwarf-kind=split -g main.rs
186186
ls $(TMPDIR)/*.o && exit 1 || exit 0
187187
ls $(TMPDIR)/*.dwo && exit 1 || exit 0
188188
rm $(TMPDIR)/main.dwp
@@ -198,13 +198,13 @@ else # Some non-Windows, non-Darwin platforms are not stable, and some are.
198198
# - (main) `.dwp` present
199199
packed-crosscrate-single:
200200
$(RUSTC) --crate-type lib $(UNSTABLEOPTS) -C split-debuginfo=packed \
201-
-Zsplit-dwarf-kind=single -C debuginfo=2 -g bar.rs
201+
-Zsplit-dwarf-kind=single -g bar.rs
202202
ls $(TMPDIR)/*.rlib
203203
ls $(TMPDIR)/*.o && exit 1 || exit 0
204204
ls $(TMPDIR)/*.dwo && exit 1 || exit 0
205205
ls $(TMPDIR)/*.dwp && exit 1 || exit 0
206206
$(RUSTC) --extern bar=$(TMPDIR)/libbar.rlib $(UNSTABLEOPTS) \
207-
-C split-debuginfo=packed -Zsplit-dwarf-kind=single -C debuginfo=2 -g main.rs
207+
-C split-debuginfo=packed -Zsplit-dwarf-kind=single -g main.rs
208208
ls $(TMPDIR)/*.o && exit 1 || exit 0
209209
ls $(TMPDIR)/*.dwo && exit 1 || exit 0
210210
rm $(TMPDIR)/main.dwp
@@ -268,8 +268,8 @@ else # Some non-Windows, non-Darwin platforms are not stable, and some are.
268268
# - `.dwo` present
269269
# - `.dwp` never created
270270
unpacked-remapped-split:
271-
$(RUSTC) $(UNSTABLEOPTS) -C split-debuginfo=unpacked -C debuginfo=2 \
272-
-Z split-dwarf-kind=split --remap-path-prefix $(TMPDIR)=/a foo.rs -g
271+
$(RUSTC) $(UNSTABLEOPTS) -C split-debuginfo=unpacked -g \
272+
-Z split-dwarf-kind=split --remap-path-prefix $(TMPDIR)=/a foo.rs
273273
objdump -Wi $(TMPDIR)/foo | grep DW_AT_GNU_dwo_name | (! grep $(TMPDIR)) || exit 1
274274
ls $(TMPDIR)/*.o && exit 1 || exit 0
275275
rm $(TMPDIR)/*.dwo
@@ -282,8 +282,8 @@ else # Some non-Windows, non-Darwin platforms are not stable, and some are.
282282
# - `.dwo` never created
283283
# - `.dwp` never created
284284
unpacked-remapped-single:
285-
$(RUSTC) $(UNSTABLEOPTS) -C split-debuginfo=unpacked -C debuginfo=2 \
286-
-Z split-dwarf-kind=single --remap-path-prefix $(TMPDIR)=/a foo.rs -g
285+
$(RUSTC) $(UNSTABLEOPTS) -C split-debuginfo=unpacked -g \
286+
-Z split-dwarf-kind=single --remap-path-prefix $(TMPDIR)=/a foo.rs
287287
objdump -Wi $(TMPDIR)/foo | grep DW_AT_GNU_dwo_name | (! grep $(TMPDIR)) || exit 1
288288
rm $(TMPDIR)/*.o
289289
ls $(TMPDIR)/*.dwo && exit 1 || exit 0
@@ -296,9 +296,9 @@ else # Some non-Windows, non-Darwin platforms are not stable, and some are.
296296
# - `.dwo` never created
297297
# - `.dwp` never created
298298
unpacked-remapped-scope:
299-
$(RUSTC) $(UNSTABLEOPTS) -C split-debuginfo=unpacked -C debuginfo=2 \
299+
$(RUSTC) $(UNSTABLEOPTS) -C split-debuginfo=unpacked -g \
300300
-Z split-dwarf-kind=single --remap-path-prefix $(TMPDIR)=/a \
301-
-Z remap-path-scope=debuginfo foo.rs -g
301+
-Z remap-path-scope=debuginfo foo.rs
302302
objdump -Wi $(TMPDIR)/foo | grep DW_AT_GNU_dwo_name | (! grep $(TMPDIR)) || exit 1
303303
rm $(TMPDIR)/*.o
304304
ls $(TMPDIR)/*.dwo && exit 1 || exit 0
@@ -311,9 +311,9 @@ else # Some non-Windows, non-Darwin platforms are not stable, and some are.
311311
# - `.dwo` never created
312312
# - `.dwp` never created
313313
unpacked-remapped-wrong-scope:
314-
$(RUSTC) $(UNSTABLEOPTS) -C split-debuginfo=unpacked -C debuginfo=2 \
314+
$(RUSTC) $(UNSTABLEOPTS) -C split-debuginfo=unpacked -g \
315315
-Z split-dwarf-kind=single --remap-path-prefix $(TMPDIR)=/a \
316-
-Z remap-path-scope=macro foo.rs -g
316+
-Z remap-path-scope=macro foo.rs
317317
objdump -Wi $(TMPDIR)/foo | grep DW_AT_GNU_dwo_name | (grep $(TMPDIR)) || exit 1
318318
rm $(TMPDIR)/*.o
319319
ls $(TMPDIR)/*.dwo && exit 1 || exit 0
@@ -332,13 +332,13 @@ else # Some non-Windows, non-Darwin platforms are not stable, and some are.
332332
# - (main) `.dwp` never created
333333
unpacked-crosscrate-split:
334334
$(RUSTC) --crate-type lib $(UNSTABLEOPTS) -C split-debuginfo=unpacked \
335-
-Zsplit-dwarf-kind=split -C debuginfo=2 -g bar.rs
335+
-Zsplit-dwarf-kind=split -g bar.rs
336336
ls $(TMPDIR)/*.rlib
337337
ls $(TMPDIR)/*.o && exit 1 || exit 0
338338
ls $(TMPDIR)/*.dwo
339339
ls $(TMPDIR)/*.dwp && exit 1 || exit 0
340340
$(RUSTC) --extern bar=$(TMPDIR)/libbar.rlib $(UNSTABLEOPTS) \
341-
-C split-debuginfo=unpacked -Zsplit-dwarf-kind=split -C debuginfo=2 -g main.rs
341+
-C split-debuginfo=unpacked -Zsplit-dwarf-kind=split -g main.rs
342342
ls $(TMPDIR)/*.o && exit 1 || exit 0
343343
rm $(TMPDIR)/*.dwo
344344
ls $(TMPDIR)/*.dwp && exit 1 || exit 0
@@ -354,13 +354,13 @@ else # Some non-Windows, non-Darwin platforms are not stable, and some are.
354354
# - (main) `.dwp` never created
355355
unpacked-crosscrate-single:
356356
$(RUSTC) --crate-type lib $(UNSTABLEOPTS) -C split-debuginfo=unpacked \
357-
-Zsplit-dwarf-kind=single -C debuginfo=2 -g bar.rs
357+
-Zsplit-dwarf-kind=single -g bar.rs
358358
ls $(TMPDIR)/*.rlib
359359
ls $(TMPDIR)/*.o
360360
ls $(TMPDIR)/*.dwo && exit 1 || exit 0
361361
ls $(TMPDIR)/*.dwp && exit 1 || exit 0
362362
$(RUSTC) --extern bar=$(TMPDIR)/libbar.rlib $(UNSTABLEOPTS) \
363-
-C split-debuginfo=unpacked -Zsplit-dwarf-kind=single -C debuginfo=2 -g main.rs
363+
-C split-debuginfo=unpacked -Zsplit-dwarf-kind=single -g main.rs
364364
ls $(TMPDIR)/*.o
365365
ls $(TMPDIR)/*.dwo && exit 1 || exit 0
366366
ls $(TMPDIR)/*.dwp && exit 1 || exit 0

0 commit comments

Comments
 (0)