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

fix editor test

Browse source
This commit is contained in:
Anton-4 2023-03-14 18:24:30 +01:00
parent 16f32c9409
commit 0605639fa8
No known key found for this signature in database
GPG key ID: 0971D718C0A9B937
2 changed files with 40 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/cli/tests/editor.rs
View file

@ -8,12 +8,12 @@ mod editor_launch_test {
thread, thread,
}; };
use cli_utils::helpers::build_roc_bin_cached; use cli_utils::helpers::build_roc_bin;
use roc_cli::CMD_EDIT; use roc_cli::CMD_EDIT;
use roc_command_utils::root_dir; use roc_command_utils::root_dir;
use std::io::Read; use std::io::Read;
#[ignore = "we don't want to bring up the editor window during regular tests, only on specific CI machines"] #[ignore = "We don't want to bring up the editor window during regular tests, only on specific CI machines."]
#[test] #[test]
fn launch_test() { fn launch_test() {
launch(None); launch(None);
@ -32,7 +32,7 @@ mod editor_launch_test {
env::set_current_dir(&root_dir) env::set_current_dir(&root_dir)
.unwrap_or_else(|_| panic!("Failed to set current dir to {:?}", root_dir)); .unwrap_or_else(|_| panic!("Failed to set current dir to {:?}", root_dir));
let roc_binary_path = build_roc_bin_cached(); let roc_binary_path = build_roc_bin(&vec!["--features", "editor"]);
let mut cmd_args = vec![CMD_EDIT]; let mut cmd_args = vec![CMD_EDIT];

14
crates/cli_utils/src/helpers.rs
View file

@ -39,6 +39,15 @@ pub fn build_roc_bin_cached() -> PathBuf {
let roc_binary_path = path_to_roc_binary(); let roc_binary_path = path_to_roc_binary();
if !roc_binary_path.exists() { if !roc_binary_path.exists() {
build_roc_bin(&[]);
}
roc_binary_path
}
pub fn build_roc_bin(extra_args: &[&str]) -> PathBuf {
let roc_binary_path = path_to_roc_binary();
// Remove the /target/release/roc part // Remove the /target/release/roc part
let root_project_dir = roc_binary_path let root_project_dir = roc_binary_path
.parent() .parent()
@ -50,12 +59,14 @@ pub fn build_roc_bin_cached() -> PathBuf {
// cargo build --bin roc // cargo build --bin roc
// (with --release iff the test is being built with --release) // (with --release iff the test is being built with --release)
let args = if cfg!(debug_assertions) { let mut args = if cfg!(debug_assertions) {
vec!["build", "--bin", "roc"] vec!["build", "--bin", "roc"]
} else { } else {
vec!["build", "--release", "--bin", "roc"] vec!["build", "--release", "--bin", "roc"]
}; };
args.extend(extra_args);
let mut cargo_cmd = cargo(); let mut cargo_cmd = cargo();
cargo_cmd.current_dir(root_project_dir).args(&args); cargo_cmd.current_dir(root_project_dir).args(&args);
@ -72,7 +83,6 @@ pub fn build_roc_bin_cached() -> PathBuf {
String::from_utf8(cargo_output.stderr).unwrap() String::from_utf8(cargo_output.stderr).unwrap()
); );
} }
}
roc_binary_path roc_binary_path
} }