Skip to content

Commit 4deb072

Browse files
committed
Fix tests
1 parent af97f86 commit 4deb072

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

tests/run-make/emit-path-unhashed/Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ OUT=$(TMPDIR)/emit
55
# --emit KIND=PATH should not affect crate hash vs --emit KIND
66
all: $(OUT)/a/libfoo.rlib $(OUT)/b/libfoo.rlib $(OUT)/c/libfoo.rlib \
77
$(TMPDIR)/libfoo.rlib
8-
$(RUSTC) -Zls $(TMPDIR)/libfoo.rlib > $(TMPDIR)/base.txt
9-
$(RUSTC) -Zls $(OUT)/a/libfoo.rlib > $(TMPDIR)/a.txt
10-
$(RUSTC) -Zls $(OUT)/b/libfoo.rlib > $(TMPDIR)/b.txt
11-
$(RUSTC) -Zls $(OUT)/c/libfoo.rlib > $(TMPDIR)/c.txt
8+
$(RUSTC) -Zls=root $(TMPDIR)/libfoo.rlib > $(TMPDIR)/base.txt
9+
$(RUSTC) -Zls=root $(OUT)/a/libfoo.rlib > $(TMPDIR)/a.txt
10+
$(RUSTC) -Zls=root $(OUT)/b/libfoo.rlib > $(TMPDIR)/b.txt
11+
$(RUSTC) -Zls=root $(OUT)/c/libfoo.rlib > $(TMPDIR)/c.txt
1212

1313
diff $(TMPDIR)/base.txt $(TMPDIR)/a.txt
1414
diff $(TMPDIR)/base.txt $(TMPDIR)/b.txt

tests/run-make/ls-metadata/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ include ../tools.mk
33

44
all:
55
$(RUSTC) foo.rs
6-
$(RUSTC) -Z ls $(TMPDIR)/foo
6+
$(RUSTC) -Z ls=root $(TMPDIR)/foo
77
touch $(TMPDIR)/bar
8-
$(RUSTC) -Z ls $(TMPDIR)/bar
8+
$(RUSTC) -Z ls=root $(TMPDIR)/bar

tests/run-make/output-filename-overwrites-input/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ all:
88
cp bar.rs $(TMPDIR)/bar.rlib
99
$(RUSTC) $(TMPDIR)/bar.rlib -o $(TMPDIR)/bar.rlib 2>&1 \
1010
| $(CGREP) -e "the input file \".*bar.rlib\" would be overwritten by the generated executable"
11-
$(RUSTC) foo.rs 2>&1 && $(RUSTC) -Z ls $(TMPDIR)/foo 2>&1
11+
$(RUSTC) foo.rs 2>&1 && $(RUSTC) -Z ls=root $(TMPDIR)/foo 2>&1
1212
cp foo.rs $(TMPDIR)/foo.rs
1313
$(RUSTC) $(TMPDIR)/foo.rs -o $(TMPDIR)/foo.rs 2>&1 \
1414
| $(CGREP) -e "the input file \".*foo.rs\" would be overwritten by the generated executable"

0 commit comments

Comments
 (0)