Skip to content
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.

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

[compiletest] Search *.a when getting dynamic libraries on AIX #127953

Merged
merged 2 commits into from
Jul 19, 2024
Merged
Changes from 1 commit
Commits
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
Next Next commit
AIX uses .a as dylib's suffix
Kai Luo committed Jul 19, 2024
commit c72df9ddf946e9e21226c03d5e2b373dbe862fc4
32 changes: 27 additions & 5 deletions src/tools/compiletest/src/runtest.rs
Original file line number Diff line number Diff line change
@@ -94,6 +94,8 @@ fn get_lib_name(lib: &str, aux_type: AuxType) -> Option<String> {
format!("{}.dll", lib)
} else if cfg!(target_vendor = "apple") {
format!("lib{}.dylib", lib)
} else if cfg!(target_os = "aix") {
format!("lib{}.a", lib)
} else {
format!("lib{}.so", lib)
}),
@@ -278,11 +280,19 @@ impl<'test> TestCx<'test> {
Ui | MirOpt => false,
mode => panic!("unimplemented for mode {:?}", mode),
};
if test_should_run { self.run_if_enabled() } else { WillExecute::No }
if test_should_run {
self.run_if_enabled()
} else {
WillExecute::No
}
}

fn run_if_enabled(&self) -> WillExecute {
if self.config.run_enabled() { WillExecute::Yes } else { WillExecute::Disabled }
if self.config.run_enabled() {
WillExecute::Yes
} else {
WillExecute::Disabled
}
}

fn should_run_successfully(&self, pm: Option<PassMode>) -> bool {
@@ -2441,7 +2451,11 @@ impl<'test> TestCx<'test> {
/// The revision, ignored for incremental compilation since it wants all revisions in
/// the same directory.
fn safe_revision(&self) -> Option<&str> {
if self.config.mode == Incremental { None } else { self.revision }
if self.config.mode == Incremental {
None
} else {
self.revision
}
}

/// Gets the absolute path to the directory where all output for the given
@@ -2665,7 +2679,11 @@ impl<'test> TestCx<'test> {

fn charset() -> &'static str {
// FreeBSD 10.1 defaults to GDB 6.1.1 which doesn't support "auto" charset
if cfg!(target_os = "freebsd") { "ISO-8859-1" } else { "UTF-8" }
if cfg!(target_os = "freebsd") {
"ISO-8859-1"
} else {
"UTF-8"
}
}

fn run_rustdoc_test(&self) {
@@ -4488,7 +4506,11 @@ impl<'test> TestCx<'test> {
for output_file in files {
println!("Actual {} saved to {}", kind, output_file.display());
}
if self.config.bless { 0 } else { 1 }
if self.config.bless {
0
} else {
1
}
}

fn check_and_prune_duplicate_outputs(