From af4023f116e76578f0cca3f163142b4dd99a8ec0 Mon Sep 17 00:00:00 2001 From: Folkert Date: Tue, 20 Dec 2022 16:29:01 +0100 Subject: [PATCH] make i386 cli tests compile --- crates/cli/tests/cli_run.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/crates/cli/tests/cli_run.rs b/crates/cli/tests/cli_run.rs index 9b671eede6..8faf05cc16 100644 --- a/crates/cli/tests/cli_run.rs +++ b/crates/cli/tests/cli_run.rs @@ -117,9 +117,10 @@ mod cli_run { assert!( compile_out.status.success(), - "\n___________\nRoc command failed with status {:?}:\n\n {:?}\n___________\n", + "\n___________\nRoc command failed with status {:?}:\n\n {} {}\n___________\n", compile_out.status, - compile_out + compile_out.stdout, + compile_out.stderr, ); compile_out @@ -1031,14 +1032,17 @@ mod cli_run { stdin: &[&str], executable_filename: &str, expected_ending: &str, - use_valgrind: bool, + use_valgrind: UseValgrind, ) { + use super::{concatcp, CMD_BUILD, TARGET_FLAG}; + check_output_with_stdin( &file_name, stdin, executable_filename, &[concatcp!(TARGET_FLAG, "=x86_32")], &[], + &[], expected_ending, use_valgrind, TestCliCommands::Run, @@ -1050,6 +1054,7 @@ mod cli_run { executable_filename, &[concatcp!(TARGET_FLAG, "=x86_32"), OPTIMIZE_FLAG], &[], + &[], expected_ending, use_valgrind, TestCliCommands::Run,