Fix Optimize coverage measurement

shellspec · May 27, 2020 · 97bbe9a · 97bbe9a
1 parent 5f78da4
commit 97bbe9a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/lib/core/evaluation.sh b/lib/core/evaluation.sh
@@ -21,7 +21,7 @@ shellspec_evaluation_call() {
   set "$SHELLSPEC_ERREXIT"
   "${SHELLSPEC_SHELL_OPTION:-eval}" "${SHELLSPEC_SHELL_OPTIONS:-:}"
   set +e
-  shellspec_evaluation_call_data shellspec_evaluation_call_function "$@"
+  shellspec_evaluation_call_data shellspec_evaluation_call_function "$@" &&:
   set -e -- $?
   shellspec_evaluation_cleanup "$1"
 }

diff --git a/spec/core/evaluation_spec.sh b/spec/core/evaluation_spec.sh
@@ -73,6 +73,12 @@ Describe "core/evaluation.sh"
       The status should equal 0
     End
 
+    It 'catches error when even enable errexit within function'
+      evaluation() { set -e; return 123; }
+      When call evaluation
+      The status should eq 123
+    End
+
     It 'reads data from stdin'
       Data "data"
       When call cat
@@ -156,6 +162,12 @@ Describe "core/evaluation.sh"
       The status should equal 0
     End
 
+    It 'catches error when even enable errexit within function'
+      evaluation() { set -e; return 123; }
+      When run evaluation
+      The status should eq 123
+    End
+
     It 'reads data from stdin'
       Data "data"
       When run command cat