dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rmeta_contains functions for remap-path-prefix

This commit is contained in:
Oneirical 2024-06-27 14:38:30 -04:00
parent 133b47ab38
commit 1795082842
4 changed files with 43 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock
View File

@ -3401,6 +3401,7 @@ name = "run_make_support"
version = "0.2.0"
dependencies = [
"ar",
"bstr",
"gimli 0.28.1",
"object 0.34.0",
"regex",

1
src/tools/run-make-support/Cargo.toml
View File

@ -4,6 +4,7 @@ version = "0.2.0"
edition = "2021"
[dependencies]
bstr = "1.6.0"
object = "0.34.0"
similar = "2.5.0"
wasmparser = "0.118.2"

1
src/tools/run-make-support/src/lib.rs
View File

@ -21,6 +21,7 @@ use std::io;
use std::panic;
use std::path::{Path, PathBuf};
pub use bstr;
pub use gimli;
pub use object;
pub use regex;

51
tests/run-make/remap-path-prefix/rmake.rs
View File

@ -3,9 +3,8 @@
// successfully remapped to "/the/aux" in the rmeta files.
// See https://github.com/rust-lang/rust/pull/85344
// FIXME(Oneirical): check if works without ignore-windows
use run_make_support::{invalid_utf8_contains, invalid_utf8_not_contains, is_darwin, rustc};
use run_make_support::bstr::ByteSlice;
use run_make_support::{bstr, fs_wrapper, is_darwin, rustc};
fn main() {
let mut out_simple = rustc();
@ -34,8 +33,8 @@ fn main() {
.input("auxiliary/lib.rs");
out_simple.run();
invalid_utf8_contains("liblib.rmeta", "/the/aux/lib.rs");
invalid_utf8_not_contains("liblib.rmeta", "auxiliary");
rmeta_contains("/the/aux/lib.rs");
rmeta_not_contains("auxiliary");
out_object.arg("-Zremap-path-scope=object");
out_macro.arg("-Zremap-path-scope=macro");
@ -47,12 +46,42 @@ fn main() {
}
out_object.run();
invalid_utf8_contains("liblib.rmeta", "/the/aux/lib.rs");
invalid_utf8_not_contains("liblib.rmeta", "auxiliary");
rmeta_contains("/the/aux/lib.rs");
rmeta_not_contains("auxiliary");
out_macro.run();
invalid_utf8_contains("liblib.rmeta", "/the/aux/lib.rs");
invalid_utf8_not_contains("liblib.rmeta", "auxiliary");
rmeta_contains("/the/aux/lib.rs");
rmeta_not_contains("auxiliary");
out_diagobj.run();
invalid_utf8_contains("liblib.rmeta", "/the/aux/lib.rs");
invalid_utf8_not_contains("liblib.rmeta", "auxiliary");
rmeta_contains("/the/aux/lib.rs");
rmeta_not_contains("auxiliary");
}
//FIXME(Oneirical): These could be generalized into run_make_support
// helper functions.
fn rmeta_contains(expected: &str) {
// Normalize to account for path differences in Windows.
if !bstr::BString::from(fs_wrapper::read("liblib.rmeta"))
.replace(b"\\", b"/")
.contains_str(expected)
{
eprintln!("=== FILE CONTENTS (LOSSY) ===");
eprintln!("{}", String::from_utf8_lossy(&fs_wrapper::read("liblib.rmeta")));
eprintln!("=== SPECIFIED TEXT ===");
eprintln!("{}", expected);
panic!("specified text was not found in file");
}
}
fn rmeta_not_contains(expected: &str) {
// Normalize to account for path differences in Windows.
if bstr::BString::from(fs_wrapper::read("liblib.rmeta"))
.replace(b"\\", b"/")
.contains_str(expected)
{
eprintln!("=== FILE CONTENTS (LOSSY) ===");
eprintln!("{}", String::from_utf8_lossy(&fs_wrapper::read("liblib.rmeta")));
eprintln!("=== SPECIFIED TEXT ===");
eprintln!("{}", expected);
panic!("specified text was not found in file");
}
}