diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-07-31 22:49:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-31 22:49:49 +0200 |
| commit | 93d65adb3655eb26364f2925f0fd9c92dc6f1b01 (patch) | |
| tree | df358602066dae0b70cf5104e375136b5a6688af | |
| parent | ba196c2ef5b871f6a4dbe19e807b5cda2873ecac (diff) | |
| parent | 3670bf182097293bbf82abb39131735d86b572e0 (diff) | |
| download | rust-93d65adb3655eb26364f2925f0fd9c92dc6f1b01.tar.gz rust-93d65adb3655eb26364f2925f0fd9c92dc6f1b01.zip | |
Rollup merge of #113889 - fortanix:raoul/fix_ice_tests_for_sgx_platform, r=Mark-Simulacrum
Fix ice tests when librustc-driver is linked dynamically Running `dump-ice-to-disk`and `short-ice` tests on Linux targeting `x86_64-fortanix-unknown-sgx` platform results in: ``` jenkins@31cf43196355:~/workspace/rust-sgx-ci/Raoul/rust$ cat /home/jenkins/workspace/rust-sgx-ci/Raoul/rust/build/x86_64-unknown-linux-gnu/test/run-make/dump-ice-to-disk/dump-ice-to-disk/* /home/jenkins/workspace/rust-sgx-ci/Raoul/rust/build/x86_64-unknown-linux-gnu/stage1/bin/rustc: error while loading shared libraries: librustc_driver-fa98927b935b2881.so: cannot open shared object file: No such file or directory /home/jenkins/workspace/rust-sgx-ci/Raoul/rust/build/x86_64-unknown-linux-gnu/stage1/bin/rustc: error while loading shared libraries: librustc_driver-fa98927b935b2881.so: cannot open shared object file: No such file or directory /home/jenkins/workspace/rust-sgx-ci/Raoul/rust/build/x86_64-unknown-linux-gnu/stage1/bin/rustc: error while loading shared libraries: librustc_driver-fa98927b935b2881.so: cannot open shared object file: No such file or directory /home/jenkins/workspace/rust-sgx-ci/Raoul/rust/build/x86_64-unknown-linux-gnu/stage1/bin/rustc: error while loading shared libraries: librustc_driver-fa98927b935b2881.so: cannot open shared object file: No such file or directory ``` Setting the LD_LIBRARY_PATH explicitly to `$(HOST_RPATH_DIR)` in these tests Makefiles resolves the issue. The `thumb-none-qemu` and `thumb-none-cortex-m` run-make tests do something similar. cc: ```@jethrogb``` ```@vn971``` ```@mkaynov```
| -rw-r--r-- | tests/run-make/dump-ice-to-disk/Makefile | 1 | ||||
| -rw-r--r-- | tests/run-make/short-ice/Makefile | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/run-make/dump-ice-to-disk/Makefile b/tests/run-make/dump-ice-to-disk/Makefile index 4f33d590237..23006fc09e2 100644 --- a/tests/run-make/dump-ice-to-disk/Makefile +++ b/tests/run-make/dump-ice-to-disk/Makefile @@ -3,6 +3,7 @@ include ../tools.mk # ignore-windows export RUSTC := $(RUSTC_ORIGINAL) +export LD_LIBRARY_PATH := $(HOST_RPATH_DIR) export TMPDIR := $(TMPDIR) all: diff --git a/tests/run-make/short-ice/Makefile b/tests/run-make/short-ice/Makefile index 4f33d590237..23006fc09e2 100644 --- a/tests/run-make/short-ice/Makefile +++ b/tests/run-make/short-ice/Makefile @@ -3,6 +3,7 @@ include ../tools.mk # ignore-windows export RUSTC := $(RUSTC_ORIGINAL) +export LD_LIBRARY_PATH := $(HOST_RPATH_DIR) export TMPDIR := $(TMPDIR) all: |