From 5a36e685e59fe1f3d891acdafe61e177033b6e78 Mon Sep 17 00:00:00 2001 From: Casey Rodarmor Date: Fri, 26 Jan 2024 13:05:32 -0800 Subject: [PATCH] Convert run_shebang into integration test (#1880) --- src/justfile.rs | 30 ------------------------------ tests/shebang.rs | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 30 deletions(-) diff --git a/src/justfile.rs b/src/justfile.rs index 84e1c2b..f8f2455 100644 --- a/src/justfile.rs +++ b/src/justfile.rs @@ -565,36 +565,6 @@ mod tests { } } - // This test exists to make sure that shebang recipes run correctly. Although - // this script is still executed by a shell its behavior depends on the value of - // a variable and continuing even though a command fails, whereas in plain - // recipes variables are not available in subsequent lines and execution stops - // when a line fails. - run_error! { - name: run_shebang, - src: " - a: - #!/usr/bin/env sh - code=200 - x() { return $code; } - x - x - ", - args: ["a"], - error: Code { - recipe, - line_number, - code, - print_message, - }, - check: { - assert_eq!(recipe, "a"); - assert_eq!(code, 200); - assert_eq!(line_number, None); - assert!(print_message); - } - } - run_error! { name: code_error, src: " diff --git a/tests/shebang.rs b/tests/shebang.rs index 04451b7..986d0ca 100644 --- a/tests/shebang.rs +++ b/tests/shebang.rs @@ -57,3 +57,26 @@ fn simple() { .stdout("bar\n") .run(); } + +// This test exists to make sure that shebang recipes run correctly. Although +// this script is still executed by a shell its behavior depends on the value of +// a variable and continuing even though a command fails, whereas in plain +// recipes variables are not available in subsequent lines and execution stops +// when a line fails. +#[test] +fn run_shebang() { + Test::new() + .justfile( + " + a: + #!/usr/bin/env sh + code=200 + x() { return $code; } + x + x + ", + ) + .status(200) + .stderr("error: Recipe `a` failed with exit code 200\n") + .run(); +}