1 files changed, 42 insertions, 10 deletions
diff --git a/tests/stack.test b/tests/stack.test
index 461e8d3..62c3e98 100644
--- a/tests/stack.test
+++ b/tests/stack.test
@@ -4,36 +4,68 @@
 # built-in commands.  Sourcing this file into Tcl runs the tests and
 # generates output for errors.  No output means no errors were found.
 #
-# Copyright © 1998-2000 Ajuba Solutions.
+# Copyright (c) 1998-2000 Ajuba Solutions.
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2.5
-    namespace import -force ::tcltest::*
+package require tcltest 2
+namespace import ::tcltest::*
+
+# Note that a failure in this test results in a crash of the executable.
+# In order to avoid that, we do a basic check of the current stacksize.
+# This size can be changed with ulimit (ksh/bash/sh) or limit (csh/tcsh).
+
+# This doesn't catch all cases, for example threads of lower stacksize
+# can still squeak through.  A core check is really needed. -- JH
+
+testConstraint minStack2034 1
+if {[testConstraint unix]} {
+    set stackSize [exec /bin/sh -c "ulimit -s"]
+    if {[string is integer $stackSize] && ($stackSize < 2034)} {
+        puts stderr "WARNING: the default application stacksize of $stackSize\
+                may cause Tcl to\ncrash due to stack overflow before the\
+                recursion limit is reached.\nA minimum stacksize of 2034\
+                kbytes is recommended.\nSkipping infinite recursion test."
+        testConstraint minStack2034 0
+    }
 }
 
-# Note that a failure in this test may result in a crash of the executable.
+#
+# Custom match to detect a stack overflow independently of the mechanism that
+# triggered the error.
+#
+
+customMatch stackOverflow StackOverflow
+proc StackOverflow {- res} {
+    set msgList [list \
+            "too many nested evaluations (infinite loop?)"\
+	    "out of stack space (infinite loop?)"]
+    expr {$res in $msgList}
+}
 
-test stack-1.1 {maxNestingDepth reached on infinite recursion} -body {
+test stack-1.1 {maxNestingDepth reached on infinite recursion} -constraints {
+    minStack2034
+} -body {
     # do this in a sub process in case it segfaults
     exec [interpreter] << {
 	proc recurse {} { recurse }
 	catch { recurse } rv
 	puts $rv
     }
-} -result {too many nested evaluations (infinite loop?)}
+} -match stackOverflow
 
-test stack-2.1 {maxNestingDepth reached on infinite recursion} -body {
+test stack-2.1 {maxNestingDepth reached on infinite recursion} -constraints {
+    minStack2034
+} -body {
     # do this in a sub process in case it segfaults
     exec [interpreter] << {
 	interp alias {} unknown {} notaknownproc
 	catch { unknown } msg
 	puts $msg
     }
-} -result {too many nested evaluations (infinite loop?)}
-
+} -match stackOverflow 
+    
 # Make sure that there is enough stack to run regexp even if we're
 # close to the recursion limit. [Bug 947070] [Patch 746378]
 test stack-3.1 {enough room for regexp near recursion limit} -body {