Skip to content

Commit

Permalink
fix: --inspect flag working like --inspect-brk (denoland#5697)
Browse files Browse the repository at this point in the history
  • Loading branch information
bartlomieju committed May 21, 2020
1 parent 8d8a2f5 commit 491feb8
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 1 deletion.
4 changes: 3 additions & 1 deletion cli/state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,9 @@ impl State {
#[inline]
pub fn should_inspector_break_on_first_statement(&self) -> bool {
let state = self.borrow();
state.inspector.is_some() && state.is_main
state.inspector.is_some()
&& state.is_main
&& state.global_state.flags.inspect_brk.is_some()
}

#[cfg(test)]
Expand Down
5 changes: 5 additions & 0 deletions cli/tests/inspector4.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
console.log("hello");

setInterval(() => {
console.log("hello from interval");
}, 1000);
25 changes: 25 additions & 0 deletions cli/tests/integration_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2465,6 +2465,31 @@ async fn inspector_does_not_hang() {
assert!(child.wait().unwrap().success());
}

#[tokio::test]
async fn inspector_without_brk_runs_code() {
let script = util::tests_path().join("inspector4.js");
let mut child = util::deno_cmd()
.arg("run")
// Warning: each inspector test should be on its own port to avoid
// conflicting with another inspector test.
.arg("--inspect=127.0.0.1:9233")
.arg(script)
.stdout(std::process::Stdio::piped())
.stderr(std::process::Stdio::piped())
.spawn()
.unwrap();
extract_ws_url_from_stderr(child.stderr.as_mut().unwrap());

// Check that inspector actually runs code without waiting for inspector
// connection
let mut stdout = std::io::BufReader::new(child.stdout.as_mut().unwrap());
let mut stdout_first_line = String::from("");
let _ = stdout.read_line(&mut stdout_first_line).unwrap();
assert_eq!(stdout_first_line, "hello\n");

child.kill().unwrap();
}

#[test]
fn exec_path() {
let output = util::deno_cmd()
Expand Down

0 comments on commit 491feb8

Please sign in to comment.