about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJakub Beránek <berykubik@gmail.com>2025-01-21 12:36:59 +0100
committerJakub Beránek <berykubik@gmail.com>2025-01-22 12:47:44 +0100
commit7877883339e96577701344bd68a80470e1be22aa (patch)
tree08c77a950ae9f64605c1a761ff01a48c581b22d5
parent75f8cc6ab651558a37d78b45deddf6ee8f526c80 (diff)
downloadrust-7877883339e96577701344bd68a80470e1be22aa.tar.gz
rust-7877883339e96577701344bd68a80470e1be22aa.zip
Run the glibc run-make test in opt-dist
-rw-r--r--src/tools/compiletest/src/header.rs2
-rw-r--r--src/tools/opt-dist/src/tests.rs1
-rw-r--r--tests/run-make/glibc-symbols-x86_64-unknown-linux-gnu/rmake.rs2
3 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs
index 82925f54a16..8c96554738e 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 00861f0c659..8b3bd77141b 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 ec693ca793c..76acf93c055 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<GlibcSymbol> {
 
     // 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()