diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:20:39 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:20:39 +0000 |
| commit | 1376c5a617be5c25655d0d7cb63e3beaa5a6e026 (patch) | |
| tree | 3bb8d61aee02bc7a15eab3f36e3b921afc2075d0 /tests/run-make/share-generics-dylib | |
| parent | Releasing progress-linux version 1.69.0+dfsg1-1~progress7.99u1. (diff) | |
| download | rustc-1376c5a617be5c25655d0d7cb63e3beaa5a6e026.tar.xz rustc-1376c5a617be5c25655d0d7cb63e3beaa5a6e026.zip | |
Merging upstream version 1.70.0+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | tests/run-make/share-generics-dylib/Makefile (renamed from tests/run-make-fulldeps/share-generics-dylib/Makefile) | 3 | ||||
| -rw-r--r-- | tests/run-make/share-generics-dylib/instance_provider_a.rs (renamed from tests/run-make-fulldeps/share-generics-dylib/instance_provider_a.rs) | 0 | ||||
| -rw-r--r-- | tests/run-make/share-generics-dylib/instance_provider_b.rs (renamed from tests/run-make-fulldeps/share-generics-dylib/instance_provider_b.rs) | 0 | ||||
| -rw-r--r-- | tests/run-make/share-generics-dylib/instance_user_a_rlib.rs (renamed from tests/run-make-fulldeps/share-generics-dylib/instance_user_a_rlib.rs) | 0 | ||||
| -rw-r--r-- | tests/run-make/share-generics-dylib/instance_user_b_rlib.rs (renamed from tests/run-make-fulldeps/share-generics-dylib/instance_user_b_rlib.rs) | 0 | ||||
| -rw-r--r-- | tests/run-make/share-generics-dylib/instance_user_dylib.rs (renamed from tests/run-make-fulldeps/share-generics-dylib/instance_user_dylib.rs) | 0 | ||||
| -rw-r--r-- | tests/run-make/share-generics-dylib/linked_leaf.rs (renamed from tests/run-make-fulldeps/share-generics-dylib/linked_leaf.rs) | 0 |
7 files changed, 2 insertions, 1 deletions
diff --git a/tests/run-make-fulldeps/share-generics-dylib/Makefile b/tests/run-make/share-generics-dylib/Makefile index 065fb574c..9d97eca80 100644 --- a/tests/run-make-fulldeps/share-generics-dylib/Makefile +++ b/tests/run-make/share-generics-dylib/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile # This test makes sure all generic instances get re-exported from Rust dylibs for use by # `-Zshare-generics`. There are two rlibs (`instance_provider_a` and `instance_provider_b`) # which both provide an instance of `Cell<i32>::set`. There is `instance_user_dylib` which is @@ -9,7 +10,7 @@ # # This is regression test for https://github.com/rust-lang/rust/issues/67276. -include ../../run-make-fulldeps/tools.mk +include ../tools.mk COMMON_ARGS=-Cprefer-dynamic -Zshare-generics=yes -Ccodegen-units=1 -Csymbol-mangling-version=v0 diff --git a/tests/run-make-fulldeps/share-generics-dylib/instance_provider_a.rs b/tests/run-make/share-generics-dylib/instance_provider_a.rs index b4e125ac0..b4e125ac0 100644 --- a/tests/run-make-fulldeps/share-generics-dylib/instance_provider_a.rs +++ b/tests/run-make/share-generics-dylib/instance_provider_a.rs diff --git a/tests/run-make-fulldeps/share-generics-dylib/instance_provider_b.rs b/tests/run-make/share-generics-dylib/instance_provider_b.rs index f613db873..f613db873 100644 --- a/tests/run-make-fulldeps/share-generics-dylib/instance_provider_b.rs +++ b/tests/run-make/share-generics-dylib/instance_provider_b.rs diff --git a/tests/run-make-fulldeps/share-generics-dylib/instance_user_a_rlib.rs b/tests/run-make/share-generics-dylib/instance_user_a_rlib.rs index c8e6ab95c..c8e6ab95c 100644 --- a/tests/run-make-fulldeps/share-generics-dylib/instance_user_a_rlib.rs +++ b/tests/run-make/share-generics-dylib/instance_user_a_rlib.rs diff --git a/tests/run-make-fulldeps/share-generics-dylib/instance_user_b_rlib.rs b/tests/run-make/share-generics-dylib/instance_user_b_rlib.rs index 7c34af6d0..7c34af6d0 100644 --- a/tests/run-make-fulldeps/share-generics-dylib/instance_user_b_rlib.rs +++ b/tests/run-make/share-generics-dylib/instance_user_b_rlib.rs diff --git a/tests/run-make-fulldeps/share-generics-dylib/instance_user_dylib.rs b/tests/run-make/share-generics-dylib/instance_user_dylib.rs index 7c8368eec..7c8368eec 100644 --- a/tests/run-make-fulldeps/share-generics-dylib/instance_user_dylib.rs +++ b/tests/run-make/share-generics-dylib/instance_user_dylib.rs diff --git a/tests/run-make-fulldeps/share-generics-dylib/linked_leaf.rs b/tests/run-make/share-generics-dylib/linked_leaf.rs index e510dad69..e510dad69 100644 --- a/tests/run-make-fulldeps/share-generics-dylib/linked_leaf.rs +++ b/tests/run-make/share-generics-dylib/linked_leaf.rs |