language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-03 00:24:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Pass input files to roc and roc run in CLI tests

Browse source
This commit is contained in:
Richard Feldman 2022-05-06 17:50:58 -04:00
parent 7cbde410e5
commit b64e0b3ce4
No known key found for this signature in database
GPG key ID: 7E4127D1E4241798
1 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
cli/tests/cli_run.rs
View file

@ -105,11 +105,19 @@ mod cli_run {
file: &'a Path, file: &'a Path,
args: I, args: I,
stdin: &[&str], stdin: &[&str],
input_file: Option<PathBuf>,
) -> Out { ) -> Out {
let compile_out = run_roc( let compile_out = match input_file {
Some(input_file) => run_roc(
args.into_iter()
.chain([file.to_str().unwrap(), input_file.to_str().unwrap()]),
stdin,
),
None => run_roc(
args.into_iter().chain(iter::once(file.to_str().unwrap())), args.into_iter().chain(iter::once(file.to_str().unwrap())),
stdin, stdin,
); ),
};
if !compile_out.stderr.is_empty() && if !compile_out.stderr.is_empty() &&
// If there is any stderr, it should be reporting the runtime and that's it! // If there is any stderr, it should be reporting the runtime and that's it!
@ -149,7 +157,7 @@ mod cli_run {
let out = match cli_mode { let out = match cli_mode {
CliMode::RocBuild => { CliMode::RocBuild => {
run_roc_on(file, iter::once(CMD_BUILD).chain(flags.clone()), &[]); run_roc_on(file, iter::once(CMD_BUILD).chain(flags.clone()), &[], None);
if use_valgrind && ALLOW_VALGRIND { if use_valgrind && ALLOW_VALGRIND {
let (valgrind_out, raw_xml) = if let Some(ref input_file) = input_file { let (valgrind_out, raw_xml) = if let Some(ref input_file) = input_file {
@ -157,7 +165,7 @@ mod cli_run {
stdin.clone().iter().copied(), stdin.clone().iter().copied(),
&[ &[
file.with_file_name(executable_filename).to_str().unwrap(), file.with_file_name(executable_filename).to_str().unwrap(),
input_file.to_str().unwrap(), input_file.clone().to_str().unwrap(),
], ],
) )
} else { } else {
@ -216,10 +224,13 @@ mod cli_run {
) )
} }
} }
CliMode::Roc => run_roc_on(file, flags.clone(), stdin), CliMode::Roc => run_roc_on(file, flags.clone(), stdin, input_file.clone()),
CliMode::RocRun => { CliMode::RocRun => run_roc_on(
run_roc_on(file, iter::once(CMD_RUN).chain(flags.clone()), stdin) file,
} iter::once(CMD_RUN).chain(flags.clone()),
stdin,
input_file.clone(),
),
}; };
if !&out.stdout.ends_with(expected_ending) { if !&out.stdout.ends_with(expected_ending) {
@ -307,7 +318,7 @@ mod cli_run {
} }
"hello-gui" | "breakout" => { "hello-gui" | "breakout" => {
// Since these require opening a window, we do `roc build` on them but don't run them. // Since these require opening a window, we do `roc build` on them but don't run them.
run_roc_on(&file_name, [CMD_BUILD, OPTIMIZE_FLAG], &[]); run_roc_on(&file_name, [CMD_BUILD, OPTIMIZE_FLAG], &[], None);
return; return;
} }