Skip to content

Commit abe36c4

Browse files
Ignore LLVM-dependent run-make tests on Windows
This should solve the PATH issue, and we don't need to test cross-lang LTO working on all OS-es.
1 parent 2d21df8 commit abe36c4

File tree

2 files changed

+20
-1
lines changed
  • src/test/run-make-fulldeps

2 files changed

+20
-1
lines changed

src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
21
-include ../tools.mk
32

3+
# ignore windows due to libLLVM being present in PATH and the PATH and library path being the same
4+
# (so fixing it is harder). See #57765 for context
5+
ifndef IS_WINDOWS
6+
47
# This test makes sure that we don't loose upstream object files when compiling
58
# staticlibs with -Zcross-lang-lto
69

@@ -21,3 +24,9 @@ all: staticlib.rs upstream.rs
2124
$(RUSTC) staticlib.rs -Z cross-lang-lto -Ccodegen-units=1 -Clto=thin -L. -o $(TMPDIR)/staticlib.a
2225
(cd $(TMPDIR); $(LD_LIB_PATH_ENVVAR)=$(REAL_LD_LIBRARY_PATH) llvm-ar x ./staticlib.a)
2326
ls $(TMPDIR)/upstream.*.rcgu.o
27+
28+
else
29+
30+
all:
31+
32+
endif

src/test/run-make-fulldeps/cross-lang-lto/Makefile

+10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11

22
-include ../tools.mk
33

4+
# ignore windows due to libLLVM being present in PATH and the PATH and library path being the same
5+
# (so fixing it is harder). See #57765 for context
6+
ifndef IS_WINDOWS
7+
48
# This test makes sure that the object files we generate are actually
59
# LLVM bitcode files (as used by linker LTO plugins) when compiling with
610
# -Z cross-lang-lto.
@@ -45,3 +49,9 @@ rdylib: lib.rs
4549
exe: lib.rs
4650
$(BUILD_EXE) -o $(TMPDIR)/exe.o
4751
$(call ASSERT_IS_BITCODE_OBJ, $(TMPDIR)/exe.o)
52+
53+
else
54+
55+
all:
56+
57+
endif

0 commit comments

Comments
 (0)