Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Rollup of 5 pull requests #125899

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 15 commits into from
Closed

Rollup of 5 pull requests #125899

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
849c525
Change f32::midpoint to upcast to f64
RustyYato Feb 14, 2024
d00a59c
Add new `MSVC_LIB_PATH` runtest environment variable to know location…
GuillaumeGomez Jun 2, 2024
2416f46
Add `dynamic_lib_extension` and `read_dir` functions to `run-make-sup…
GuillaumeGomez May 31, 2024
32933a6
Migrate `run-make/c-link-to-rust-dylib` to `rmake.rs`
GuillaumeGomez May 31, 2024
5a00105
Add `Rustc::extra_filename` method
GuillaumeGomez Jun 2, 2024
e3ded7b
Add `run_make_support::build_native_static_lib` function
GuillaumeGomez Jun 2, 2024
050ff9c
Migrate `run-make/issue-15460` to `rmake.rs`
GuillaumeGomez Jun 2, 2024
3aefc4a
Improve compiletest expected/not found formatting
Noratrieb Jun 2, 2024
36aba94
Rename `tests/run-make/issue-15460` into `tests/run-make/link-native-…
GuillaumeGomez Jun 2, 2024
590c373
compiletest: fix outdated rmake.rs comment
jieyouxu Jun 2, 2024
d7904c7
Rollup merge of #121062 - RustyYato:f32-midpoint, r=the8472
jieyouxu Jun 2, 2024
78e8ca4
Rollup merge of #125808 - GuillaumeGomez:migrate-run-make-c-link-to-r…
jieyouxu Jun 2, 2024
8d471c8
Rollup merge of #125886 - GuillaumeGomez:migrate-run-make-issue-15460…
jieyouxu Jun 2, 2024
cc938c5
Rollup merge of #125890 - Nilstrieb:gay-compiletest, r=jieyouxu
jieyouxu Jun 2, 2024
619dd86
Rollup merge of #125896 - jieyouxu:compiletest-rmake-comment, r=compi…
jieyouxu Jun 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add dynamic_lib_extension and read_dir functions to `run-make-sup… 
…port` library
  • Loading branch information
@GuillaumeGomez
GuillaumeGomez committed Jun 2, 2024
commit 2416f460f8ae0aa7ed0a47a1c2ed2c3d96645435
38 changes: 26 additions & 12 deletions src/tools/run-make-support/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,23 @@ pub fn dynamic_lib_name(name: &str) -> String {
// ```
assert!(!name.contains(char::is_whitespace), "dynamic library name cannot contain whitespace");

let extension = dynamic_lib_extension();
if is_darwin() {
format!("lib{name}.dylib")
format!("lib{name}.{extension}")
} else if is_windows() {
format!("{name}.dll")
format!("{name}.{extension}")
} else {
format!("lib{name}.so")
format!("lib{name}.{extension}")
}
}

pub fn dynamic_lib_extension() -> &'static str {
if is_darwin() {
"dylib"
} else if is_windows() {
"dll"
} else {
"so"
}
}

Expand Down Expand Up @@ -249,16 +260,13 @@ pub fn recursive_diff(dir1: impl AsRef<Path>, dir2: impl AsRef<Path>) {
}

let dir2 = dir2.as_ref();
for entry in fs::read_dir(dir1).unwrap() {
let entry = entry.unwrap();
let entry_name = entry.file_name();
let path = entry.path();

if path.is_dir() {
recursive_diff(&path, &dir2.join(entry_name));
read_dir(dir1, |entry_path| {
let entry_name = entry_path.file_name().unwrap();
if entry_path.is_dir() {
recursive_diff(&entry_path, &dir2.join(entry_name));
} else {
let path2 = dir2.join(entry_name);
let file1 = read_file(&path);
let file1 = read_file(&entry_path);
let file2 = read_file(&path2);

// We don't use `assert_eq!` because they are `Vec<u8>`, so not great for display.
Expand All @@ -267,10 +275,16 @@ pub fn recursive_diff(dir1: impl AsRef<Path>, dir2: impl AsRef<Path>) {
assert!(
file1 == file2,
"`{}` and `{}` have different content",
path.display(),
entry_path.display(),
path2.display(),
);
}
});
}

pub fn read_dir<F: Fn(&Path)>(dir: impl AsRef<Path>, callback: F) {
for entry in fs::read_dir(dir).unwrap() {
callback(&entry.unwrap().path());
}
}

Expand Down