Skip to content

Commit f15d20c

Browse files
committedFeb 11, 2019
use ignore directives for run-make tests
This makes the tests easier to read, and makes it possible to tell which tests aren't being run on the host platform. Fixes #56704.
1 parent 57d7cfc commit f15d20c

File tree

47 files changed

+127
-297
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+127
-297
lines changed
 
Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
-include ../tools.mk
22

3+
# ignore-macos
4+
#
35
# This hits an assertion in the linker on older versions of osx apparently
4-
ifeq ($(shell uname),Darwin)
5-
all:
6-
echo ignored
7-
else
6+
87
all: $(call DYLIB,cfoo)
98
$(RUSTC) foo.rs -C prefer-dynamic
109
$(RUSTC) bar.rs
1110
$(call RUN,bar)
1211
$(call REMOVE_DYLIBS,cfoo)
1312
$(call FAIL,bar)
14-
endif
Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
-include ../tools.mk
22

3+
# ignore-macos
4+
#
5+
# This hits an assertion in the linker on older versions of osx apparently
6+
37
# This overrides the LD_LIBRARY_PATH for RUN
48
TARGET_RPATH_DIR:=$(TARGET_RPATH_DIR):$(TMPDIR)
59

6-
# This hits an assertion in the linker on older versions of osx apparently
7-
ifeq ($(shell uname),Darwin)
8-
all:
9-
echo ignored
10-
else
1110
all: $(call DYLIB,cfoo)
1211
$(RUSTC) foo.rs
1312
$(RUSTC) bar.rs
1413
$(call RUN,bar)
1514
$(call REMOVE_DYLIBS,cfoo)
1615
$(call FAIL,bar)
17-
endif

0 commit comments

Comments
 (0)