Skip to content

Commit 22b20eb

Browse files
committed
Skip these tests at stage1.
Note: apparently you cannot quote operands to `ifeq` in Makefile.
1 parent 8dad4bd commit 22b20eb

File tree

2 files changed

+26
-7
lines changed

2 files changed

+26
-7
lines changed
Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
-include ../tools.mk
22

3-
all:
3+
# This test attempts to use syntax extensions, which are known to be
4+
# incompatible with stage1 at the moment.
5+
6+
ifeq ($(RUST_BUILD_STAGE),1)
7+
DOTEST=
8+
else
9+
DOTEST=dotest
10+
endif
11+
12+
all: $(DOTEST)
13+
14+
dotest:
15+
env
416
$(RUSTC) lib.rs
517
$(RUSTC) main.rs -Z lto
618
$(call RUN,main)

src/test/run-make/unicode-input/Makefile

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,21 @@
11
-include ../tools.mk
22

3+
# This test attempts to run rustc itself from the compiled binary; but
4+
# that means that you need to set the LD_LIBRARY_PATH for rustc itself
5+
# while running muliple_files, and that won't work for stage1.
6+
37
# FIXME ignore windows
48
ifndef IS_WINDOWS
9+
ifeq ($(RUST_BUILD_STAGE),1)
10+
DOTEST=
11+
else
12+
DOTEST=dotest
13+
endif
14+
endif
15+
16+
all: $(DOTEST)
517

6-
all:
18+
dotest:
719
# check that we don't ICE on unicode input, issue #11178
820
$(RUSTC) multiple_files.rs
921
$(call RUN,multiple_files) "$(RUSTC)" "$(TMPDIR)"
@@ -12,8 +24,3 @@ all:
1224
# correct length. issue #8706
1325
$(RUSTC) span_length.rs
1426
$(call RUN,span_length) "$(RUSTC)" "$(TMPDIR)"
15-
16-
else
17-
all:
18-
19-
endif

0 commit comments

Comments
 (0)