Skip to content

Commit c341f6b

Browse files
committed
cut out a shell invocation
1 parent e41a9fc commit c341f6b

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

crates/intrinsic-test/src/common/compare.rs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@ use super::cli::FailureReason;
22
use rayon::prelude::*;
33
use std::process::Command;
44

5-
pub fn compare_outputs(
6-
intrinsic_name_list: &Vec<String>,
7-
runner: &str,
8-
target: &str,
9-
) -> bool {
5+
pub fn compare_outputs(intrinsic_name_list: &Vec<String>, runner: &str, target: &str) -> bool {
106
fn runner_command(runner: &str) -> Command {
117
let mut it = runner.split_whitespace();
128
let mut cmd = Command::new(it.next().unwrap());
@@ -18,11 +14,11 @@ pub fn compare_outputs(
1814
let intrinsics = intrinsic_name_list
1915
.par_iter()
2016
.filter_map(|intrinsic_name| {
21-
let c = runner_command(runner)
17+
let c = runner_command(runner)
2218
.arg(format!("./c_programs/{intrinsic_name}"))
2319
.output();
2420

25-
let rust = runner_command(runner)
21+
let rust = runner_command(runner)
2622
.arg(format!("./rust_programs/target/{target}/release/{intrinsic_name}"))
2723
.env("RUSTFLAGS", "-Cdebuginfo=0")
2824
.output();

crates/intrinsic-test/src/common/gen_c.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,11 @@ pub fn compile_c_programs(compiler_commands: &[String]) -> bool {
6666
compiler_commands
6767
.par_iter()
6868
.map(|compiler_command| {
69-
let output = Command::new("sh").arg("-c").arg(compiler_command).output();
69+
let mut it = compiler_command.split_whitespace();
70+
let mut cmd = Command::new(it.next().unwrap());
71+
cmd.args(it);
72+
73+
let output = cmd.output();
7074
if let Ok(output) = output {
7175
if output.status.success() {
7276
true

crates/intrinsic-test/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ fn main() {
3838
if !test_environment.build_rust_file() {
3939
std::process::exit(3);
4040
}
41-
info!("comaparing outputs");
41+
info!("comparing outputs");
4242
if !test_environment.compare_outputs() {
4343
std::process::exit(1);
4444
}

0 commit comments

Comments
 (0)