From 7877883339e96577701344bd68a80470e1be22aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= Date: Tue, 21 Jan 2025 12:36:59 +0100 Subject: [PATCH] Run the glibc run-make test in opt-dist --- src/tools/compiletest/src/header.rs | 2 +- src/tools/opt-dist/src/tests.rs | 1 + tests/run-make/glibc-symbols-x86_64-unknown-linux-gnu/rmake.rs | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs index 82925f54a1638..8c96554738e68 100644 --- a/src/tools/compiletest/src/header.rs +++ b/src/tools/compiletest/src/header.rs @@ -1280,7 +1280,7 @@ pub fn llvm_has_libzstd(config: &Config) -> bool { let stderr = String::from_utf8(output.stderr).ok()?; let zstd_available = !stderr.contains("LLVM was not built with LLVM_ENABLE_ZSTD"); - // We don't partiCOMPILETEST_ENABLE_OPT_DIST_TESTScularly need to clean the link up (so the previous commands could fail + // We don't particularly need to clean the link up (so the previous commands could fail // in theory but won't in practice), but we can try. std::fs::remove_file(lld_symlink_path).ok()?; diff --git a/src/tools/opt-dist/src/tests.rs b/src/tools/opt-dist/src/tests.rs index 00861f0c65941..8b3bd77141ba8 100644 --- a/src/tools/opt-dist/src/tests.rs +++ b/src/tools/opt-dist/src/tests.rs @@ -103,6 +103,7 @@ llvm-config = "{llvm_config}" "tests/incremental", "tests/mir-opt", "tests/pretty", + "tests/run-make/glibc-symbols-x86_64-unknown-linux-gnu", "tests/ui", "tests/crashes", ]; diff --git a/tests/run-make/glibc-symbols-x86_64-unknown-linux-gnu/rmake.rs b/tests/run-make/glibc-symbols-x86_64-unknown-linux-gnu/rmake.rs index ec693ca793c13..76acf93c0553c 100644 --- a/tests/run-make/glibc-symbols-x86_64-unknown-linux-gnu/rmake.rs +++ b/tests/run-make/glibc-symbols-x86_64-unknown-linux-gnu/rmake.rs @@ -81,7 +81,7 @@ fn get_glibc_symbols(file: &Path) -> Vec { // Uses llvm-objdump, because implementing this using the `object` crate is quite complicated. llvm_objdump() - .arg("-T") + .arg("--dynamic-syms") .arg(file) .run() .stdout_utf8()