diff options
| author | bors <bors@rust-lang.org> | 2023-04-03 07:27:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-03 07:27:58 +0000 |
| commit | 932c173ca1b7a79c1005e2d72ddfa505a7bf2cfa (patch) | |
| tree | 2c44d95b514a02c51806d2e3f38e3fe29c9b07e4 /src/tools | |
| parent | d0eed58a1e78eb1a25bb54076e4b0f7ea5ff7401 (diff) | |
| parent | 22df7107bdd36cf47e327c8165e720c1eccb351d (diff) | |
| download | rust-932c173ca1b7a79c1005e2d72ddfa505a7bf2cfa.tar.gz rust-932c173ca1b7a79c1005e2d72ddfa505a7bf2cfa.zip | |
Auto merge of #109884 - matthiaskrgr:rollup-5wapig9, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #109526 (LIBPATH is used as dylib's path environment variable on AIX) - #109642 (check for missing codegen backeng config) - #109722 (Implement read_buf for RustHermit) - #109856 (fix(middle): emit error rather than delay bug when reaching limit) - #109868 (Improve PR job names in Github Actions preview) - #109871 (Include invocation start times) - #109873 (Move some UI tests into subdirectories) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/compiletest/src/util.rs | 2 | ||||
| -rw-r--r-- | src/tools/tidy/src/ui_tests.rs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/tools/compiletest/src/util.rs b/src/tools/compiletest/src/util.rs index 5f6a27e5366..748240cc94b 100644 --- a/src/tools/compiletest/src/util.rs +++ b/src/tools/compiletest/src/util.rs @@ -156,6 +156,8 @@ pub fn dylib_env_var() -> &'static str { "DYLD_LIBRARY_PATH" } else if cfg!(target_os = "haiku") { "LIBRARY_PATH" + } else if cfg!(target_os = "aix") { + "LIBPATH" } else { "LD_LIBRARY_PATH" } diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs index 20b8a2c3b24..f582666ab28 100644 --- a/src/tools/tidy/src/ui_tests.rs +++ b/src/tools/tidy/src/ui_tests.rs @@ -9,7 +9,7 @@ use std::path::{Path, PathBuf}; const ENTRY_LIMIT: usize = 1000; // FIXME: The following limits should be reduced eventually. -const ROOT_ENTRY_LIMIT: usize = 940; +const ROOT_ENTRY_LIMIT: usize = 881; const ISSUES_ENTRY_LIMIT: usize = 1978; fn check_entries(tests_path: &Path, bad: &mut bool) { |