diff options
| author | Jubilee <46493976+workingjubilee@users.noreply.github.com> | 2024-06-06 21:10:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-06 21:10:10 -0700 |
| commit | 2acb24c4622e1f905e3d7f4c1452b6f43631c7e7 (patch) | |
| tree | 21ead3554baf90545e876a000f2dd2ca0340ba5b | |
| parent | 6a42df75178d73f271ab564ab46087ab10bde13d (diff) | |
| parent | a5429d53afa0db4bc22950f4ac62ace8019a7481 (diff) | |
| download | rust-2acb24c4622e1f905e3d7f4c1452b6f43631c7e7.tar.gz rust-2acb24c4622e1f905e3d7f4c1452b6f43631c7e7.zip | |
Rollup merge of #126098 - Kobzol:remove-same-lib-runmake-test, r=jieyouxu
Remove `same-lib-two-locations-no-panic` run-make test This test doesn't really make any sense anymore, it became broken a long time ago. r? ``@jieyouxu``
| -rw-r--r-- | tests/run-make/same-lib-two-locations-no-panic/bar.rs | 3 | ||||
| -rw-r--r-- | tests/run-make/same-lib-two-locations-no-panic/foo.rs | 1 | ||||
| -rw-r--r-- | tests/run-make/same-lib-two-locations-no-panic/rmake.rs | 28 |
3 files changed, 0 insertions, 32 deletions
diff --git a/tests/run-make/same-lib-two-locations-no-panic/bar.rs b/tests/run-make/same-lib-two-locations-no-panic/bar.rs deleted file mode 100644 index bb7b36c496e..00000000000 --- a/tests/run-make/same-lib-two-locations-no-panic/bar.rs +++ /dev/null @@ -1,3 +0,0 @@ -extern crate foo; - -fn main() {} diff --git a/tests/run-make/same-lib-two-locations-no-panic/foo.rs b/tests/run-make/same-lib-two-locations-no-panic/foo.rs deleted file mode 100644 index 82b2dfe9fdb..00000000000 --- a/tests/run-make/same-lib-two-locations-no-panic/foo.rs +++ /dev/null @@ -1 +0,0 @@ -#![crate_name = "foo"] diff --git a/tests/run-make/same-lib-two-locations-no-panic/rmake.rs b/tests/run-make/same-lib-two-locations-no-panic/rmake.rs deleted file mode 100644 index 2900c3c8b74..00000000000 --- a/tests/run-make/same-lib-two-locations-no-panic/rmake.rs +++ /dev/null @@ -1,28 +0,0 @@ -// A path which contains the same rlib or dylib in two locations -// should not cause an assertion panic in the compiler. -// This test tries to replicate the linked issue and checks -// if the bugged error makes a resurgence. - -// See https://github.com/rust-lang/rust/issues/11908 - -//@ ignore-cross-compile - -use run_make_support::{dynamic_lib, rust_lib, rustc, tmp_dir}; -use std::fs; - -fn main() { - let tmp_dir_other = tmp_dir().join("other"); - - fs::create_dir(&tmp_dir_other); - rustc().input("foo.rs").crate_type("dylib").arg("-Cprefer-dynamic").run(); - fs::rename(dynamic_lib("foo"), &tmp_dir_other); - rustc().input("foo.rs").crate_type("dylib").arg("-Cprefer-dynamic").run(); - rustc().input("bar.rs").library_search_path(&tmp_dir_other).run(); - fs::remove_dir_all(tmp_dir()); - - fs::create_dir_all(&tmp_dir_other); - rustc().input("foo.rs").crate_type("rlib").run(); - fs::rename(rust_lib("foo"), &tmp_dir_other); - rustc().input("foo.rs").crate_type("rlib").run(); - rustc().input("bar.rs").library_search_path(tmp_dir_other).run(); -} |
