unposted: tests for 39839, 39844

2 files changed, 15 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 629d36a7b..a8b55b4bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2016-11-05  Barton E. Schaefer  <schaefer@zsh.org>
 
+	* unposted: Test/A05execution.ztst:  tests for 39839, 39844
+
 	* 39844: Src/loop.c: fix "while" condition as per 39839
 
 	* 39839: Src/loop.c: fix "return" from "if" condition
diff --git a/Test/A05execution.ztst b/Test/A05execution.ztst
index 52738181d..0804691a7 100644
--- a/Test/A05execution.ztst
+++ b/Test/A05execution.ztst
@@ -284,6 +284,7 @@ F:anonymous function, and a descriptor leak when backgrounding a pipeline
   select x; do :; done; echo $?
   select x in; do :; done; echo $?
   select x in _*_; do :; done; echo $?
+  unsetopt ERR_EXIT NULL_GLOB
 0:The status of "select" is zero when the loop body does not execute
 >0
 >0
@@ -297,3 +298,15 @@ F:anonymous function, and a descriptor leak when backgrounding a pipeline
 0:Background job exit does not affect reaping foreground job
 >CHLD
 >OK
+
+# Regression test for workers/39839 and workers/39844
+  () { if return 11; then :; fi }; echo $?
+  () { while return 13; do :; done }; echo $?
+  () { until return 17; do :; done }; echo $?
+  () { until false; do return 19; done }; echo $?
+0:"return" in "if" or "while" conditional
+>11
+>13
+>17
+>19
+