Skip to content

Commit

Permalink
Port print-cfg run-make to Rust-based rmake.rs
Browse files Browse the repository at this point in the history
  • Loading branch information
Urgau committed Apr 28, 2024
1 parent 91d5e4a commit 47eefac
Show file tree
Hide file tree
Showing 4 changed files with 166 additions and 38 deletions.
1 change: 0 additions & 1 deletion src/tools/tidy/src/allowed_run_make_makefiles.txt
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,6 @@ run-make/prefer-rlib/Makefile
run-make/pretty-print-to-file/Makefile
run-make/pretty-print-with-dep-file/Makefile
run-make/print-calling-conventions/Makefile
run-make/print-cfg/Makefile
run-make/print-target-list/Makefile
run-make/profile/Makefile
run-make/prune-link-args/Makefile
Expand Down
37 changes: 0 additions & 37 deletions tests/run-make/print-cfg/Makefile

This file was deleted.

100 changes: 100 additions & 0 deletions tests/run-make/print-cfg/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
//! This checks the output of `--print=cfg`
//!
//! Specifically it checks that output is correctly formatted
//! (ie. no duplicated cfgs, values are between "", names are not).
//!
//! It also checks that some targets have the correct set cfgs.
extern crate run_make_support;

use std::collections::HashSet;
use std::ffi::OsString;
use std::io::BufRead;
use std::iter::FromIterator;

use run_make_support::{rustc, tmp_dir};

fn main() {
check(
/*target*/ "x86_64-pc-windows-gnu",
/*includes*/ &["windows", "target_arch=\"x86_64\""],
/*disallow*/ &["unix"],
);
check(
/*target*/ "i686-pc-windows-msvc",
/*includes*/ &["windows", "target_env=\"msvc\""],
/*disallow*/ &["unix"],
);
check(
/*target*/ "i686-apple-darwin",
/*includes*/ &["unix", "target_os=\"macos\"", "target_vendor=\"apple\""],
/*disallow*/ &["windows"],
);
check(
/*target*/ "i686-unknown-linux-gnu",
/*includes*/ &["unix", "target_env=\"gnu\""],
/*disallow*/ &["windows"],
);
check(
/*target*/ "arm-unknown-linux-gnueabihf",
/*includes*/ &["unix", "target_abi=\"eabihf\""],
/*disallow*/ &["windows"],
);
}

fn check(target: &str, includes: &[&str], disallow: &[&str]) {
fn _inner(output: &str, includes: &[&str], disallow: &[&str]) {
let mut found = HashSet::<String>::new();
let mut recorded = HashSet::<String>::new();

for l in output.lines() {
assert!(l == l.trim());
if let Some((left, right)) = l.split_once('=') {
assert!(right.starts_with("\""));
assert!(right.ends_with("\""));
assert!(!left.contains("\""));
} else {
assert!(!l.contains("\""));
}

assert!(recorded.insert(l.to_string()), "duplicated: {}", &l);
assert!(!disallow.contains(&l), "found disallowed: {}", &l);
if includes.contains(&l) {
assert!(found.insert(l.to_string()), "duplicated (includes): {}", &l);
}
}

let should_found = HashSet::<String>::from_iter(includes.iter().map(|s| s.to_string()));
let diff: Vec<_> = should_found.difference(&found).collect();

assert!(
diff.is_empty(),
"expected: {:?}, found: {:?} (~ {:?})",
&should_found,
&found,
&diff
);
}

// --print=cfg
{
let output = rustc().target(target).print("cfg").run();

let stdout = String::from_utf8(output.stdout).unwrap();

_inner(&stdout, includes, disallow);
}

// --print=cfg=PATH
{
let tmp_path = tmp_dir().join(format!("{target}.cfg"));
let mut print_arg = OsString::from("--print=cfg=");
print_arg.push(tmp_path.as_os_str());

let output = rustc().target(target).arg(print_arg).run();

let output = std::fs::read_to_string(&tmp_path).unwrap();

_inner(&output, includes, disallow);
}
}
66 changes: 66 additions & 0 deletions tests/run-make/print-to-output/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
//! This checks the output of some `--print` options when
//! output to a file (instead of stdout)
extern crate run_make_support;

use std::ffi::OsString;

use run_make_support::{rustc, target, tmp_dir};

fn main() {
// Printed from CodegenBackend trait impl in rustc_codegen_llvm/src/lib.rs
check(
/*target*/ &target(),
/*option*/ "relocation-models",
/*includes*/ &["dynamic-no-pic"],
);

// Printed by compiler/rustc_codegen_llvm/src/llvm_util.rs
check(
/*target*/ "wasm32-unknown-unknown",
/*option*/ "target-features",
/*includes*/ &["reference-types"],
);

// Printed by C++ code in rustc_llvm/llvm-wrapper/PassWrapper.cpp
check(
/*target*/ "wasm32-unknown-unknown",
/*option*/ "target-cpus",
/*includes*/ &["generic"],
);
}

fn check(target: &str, option: &str, includes: &[&str]) {
fn _inner(output: &str, includes: &[&str]) {
for i in includes {
assert!(output.contains(i), "output doesn't contains: {}", i);
}
}

let stdout: String;
let output: String;

// --print={option}
{
let output = rustc().target(target).print(option).run();

stdout = String::from_utf8(output.stdout).unwrap();

_inner(&stdout, includes);
}

// --print={option}=PATH
{
let tmp_path = tmp_dir().join(format!("{option}.txt"));
let mut print_arg = OsString::from(format!("--print={option}="));
print_arg.push(tmp_path.as_os_str());

let _output = rustc().target(target).arg(print_arg).run();

output = std::fs::read_to_string(&tmp_path).unwrap();

_inner(&output, includes);
}

assert_eq!(&stdout, &output);
}

0 comments on commit 47eefac

Please sign in to comment.