diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2019-01-24 12:17:02 -0700 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2019-01-26 08:02:08 -0700 |
| commit | abe36c4741e780ba3ed3e9b48d823ac8007f786a (patch) | |
| tree | 0eb9cee05ba9c35f14459c683ff6c7ba3bac8100 /src/test | |
| parent | 2d21df8a3fd7a68ba9f52389ead7f06f13190c12 (diff) | |
| download | rust-abe36c4741e780ba3ed3e9b48d823ac8007f786a.tar.gz rust-abe36c4741e780ba3ed3e9b48d823ac8007f786a.zip | |
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.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile | 11 | ||||
| -rw-r--r-- | src/test/run-make-fulldeps/cross-lang-lto/Makefile | 10 |
2 files changed, 20 insertions, 1 deletions
diff --git a/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile b/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile index 6992dab1a1b..4f33b1c59e0 100644 --- a/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile +++ b/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile @@ -1,6 +1,9 @@ - -include ../tools.mk +# ignore windows due to libLLVM being present in PATH and the PATH and library path being the same +# (so fixing it is harder). See #57765 for context +ifndef IS_WINDOWS + # This test makes sure that we don't loose upstream object files when compiling # staticlibs with -Zcross-lang-lto @@ -21,3 +24,9 @@ all: staticlib.rs upstream.rs $(RUSTC) staticlib.rs -Z cross-lang-lto -Ccodegen-units=1 -Clto=thin -L. -o $(TMPDIR)/staticlib.a (cd $(TMPDIR); $(LD_LIB_PATH_ENVVAR)=$(REAL_LD_LIBRARY_PATH) llvm-ar x ./staticlib.a) ls $(TMPDIR)/upstream.*.rcgu.o + +else + +all: + +endif diff --git a/src/test/run-make-fulldeps/cross-lang-lto/Makefile b/src/test/run-make-fulldeps/cross-lang-lto/Makefile index 4d1fb7b9537..57a19a0ccb0 100644 --- a/src/test/run-make-fulldeps/cross-lang-lto/Makefile +++ b/src/test/run-make-fulldeps/cross-lang-lto/Makefile @@ -1,6 +1,10 @@ -include ../tools.mk +# ignore windows due to libLLVM being present in PATH and the PATH and library path being the same +# (so fixing it is harder). See #57765 for context +ifndef IS_WINDOWS + # This test makes sure that the object files we generate are actually # LLVM bitcode files (as used by linker LTO plugins) when compiling with # -Z cross-lang-lto. @@ -45,3 +49,9 @@ rdylib: lib.rs exe: lib.rs $(BUILD_EXE) -o $(TMPDIR)/exe.o $(call ASSERT_IS_BITCODE_OBJ, $(TMPDIR)/exe.o) + +else + +all: + +endif |