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

minor cleanup

Browse source
This commit is contained in:
Anton-4 2024-11-12 19:16:20 +01:00
parent 9442a32a65
commit 9a3495cfae
No known key found for this signature in database
GPG key ID: 0971D718C0A9B937
3 changed files with 15 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/cli/tests/cli_tests.rs
View file

@ -202,7 +202,6 @@ mod cli_tests {
);
}
// TODO re-enable before merging
// TODO check this out, there's more that's going wrong than a segfault
//#[test]
/*#[cfg_attr(
@ -958,7 +957,7 @@ mod cli_tests {
}
}
// this is for testing the benchmarks, to perform proper benchmarks see crates/cli/benches/README.md
// this is for testing the benchmarks (on small inputs), to perform proper benchmarks see crates/cli/benches/README.md
mod test_benchmarks {
use super::{
UseValgrind, ALLOW_VALGRIND, BUILD_HOST_FLAG, OPTIMIZE_FLAG,
@ -1034,8 +1033,6 @@ mod cli_tests {
expected_output: &'static str,
stdin_opt: Option<&'static str>,
) {
dbg!("yo");
use super::{concatcp, TARGET_FLAG};
// Check with and without optimizations
run_wasm_check_output_with_flags(
roc_file_path,
@ -1060,7 +1057,6 @@ mod cli_tests {
flags: &[&str],
) {
use super::{concatcp, TARGET_FLAG};
dbg!("hey");
let mut flags = flags.to_vec();
flags.push(concatcp!(TARGET_FLAG, "=wasm32"));
@ -1069,7 +1065,6 @@ mod cli_tests {
let cli_build_out = cli_build.run();
cli_build_out.assert_clean_success();
dbg!("clean success");
// wasm can't take stdin, so we pass it as an arg
let wasm_args = if let Some(stdin) = stdin_opt {
@ -1078,16 +1073,11 @@ mod cli_tests {
vec![]
};
dbg!("pre wasm_run_out");
let wasm_run_out = crate::run_wasm_for_cli_test(
&roc_file_path.with_extension("wasm"),
wasm_args.clone(),
);
dbg!("post wasm_run_out");
dbg!(&wasm_run_out);
assert_eq!(wasm_run_out, expected_output);
if TEST_LEGACY_LINKER {
@ -1392,7 +1382,6 @@ mod cli_tests {
#[cfg(feature = "wasm32-cli-run")]
fn run_wasm_for_cli_test(wasm_path: &std::path::Path, stdin: Vec<&str>) -> String {
dbg!("in run_wasm222");
use bumpalo::Bump;
use roc_wasm_interp::{DefaultImportDispatcher, Instance, Value, WasiFile};
@ -1403,10 +1392,17 @@ fn run_wasm_for_cli_test(wasm_path: &std::path::Path, stdin: Vec<&str>) -> Strin
let mut fake_stdin = vec![];
let fake_stdout = vec![];
let fake_stderr = vec![];
let stdin_is_empty = stdin.is_empty();
for s in stdin {
fake_stdin.extend_from_slice(s.as_bytes())
}
if !stdin_is_empty {
// add newline to finish input
fake_stdin.extend_from_slice("\n".as_bytes());
}
let mut dispatcher = DefaultImportDispatcher::default();
dispatcher.wasi.files = vec![
WasiFile::ReadOnly(fake_stdin),
@ -1417,12 +1413,8 @@ fn run_wasm_for_cli_test(wasm_path: &std::path::Path, stdin: Vec<&str>) -> Strin
Instance::from_bytes(&arena, &wasm_bytes, dispatcher, false).unwrap()
};
dbg!("pre call");
let result = instance.call_export("_start", []);
dbg!("post call");
match result {
Ok(Some(Value::I32(0))) => match &instance.import_dispatcher.wasi.files[1] {
WasiFile::WriteOnly(fake_stdout) => String::from_utf8(fake_stdout.clone())