* tests/stack.test:

	* unix/tclUnixTest.c: removed test command teststacklimit and the
	corresponding constraint: it is not needed with NRE

1 files changed, 6 insertions, 46 deletions

diff --git a/tests/stack.test b/tests/stack.test
index 7d7f816..da587b5 100644
--- a/tests/stack.test
+++ b/tests/stack.test
@@ -9,72 +9,32 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: stack.test,v 1.24 2008/07/16 00:44:44 msofer Exp $
+# RCS: @(#) $Id: stack.test,v 1.25 2008/10/03 19:20:24 msofer Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
     namespace import -force ::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).
+# Note that a failure in this test may result in a crash of the executable.
 
-# This doesn't catch all cases, for example threads of lower stacksize
-# can still squeak through.  A core check is really needed. -- JH
-
-testConstraint minStack2400 1
-testConstraint teststacklimit [llength [info commands teststacklimit]]
-
-if {[testConstraint unix]} {
-    if {[testConstraint teststacklimit]} {
-	set stackSize [teststacklimit]
-    } else {
-	set stackSize [exec /bin/sh -c "ulimit -s"]
-    }
-    if {($stackSize > -1)  && ($stackSize < 2400)} {
-        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 2400\
-                kbytes is recommended.\nSkipping infinite recursion test."
-        testConstraint minStack2400 0
-    }
-}
-
-#
-# 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} -constraints {
-    minStack2400
-} -body {
+test stack-1.1 {maxNestingDepth reached on infinite recursion} -body {
     # do this in a sub process in case it segfaults
     exec [interpreter] << {
 	proc recurse {} { recurse }
 	catch { recurse } rv
 	puts $rv
     }
-} -match stackOverflow
+} -result {too many nested evaluations (infinite loop?)}
 
-test stack-2.1 {maxNestingDepth reached on infinite recursion} -constraints {
-    minStack2400
-} -body {
+test stack-2.1 {maxNestingDepth reached on infinite recursion} -body {
     # do this in a sub process in case it segfaults
     exec [interpreter] << {
 	interp alias {} unknown {} notaknownproc
 	catch { unknown } msg
 	puts $msg
     }
-} -match stackOverflow 
+} -result {too many nested evaluations (infinite loop?)}
     
 # Make sure that there is enough stack to run regexp even if we're
 # close to the recursion limit. [Bug 947070] [Patch 746378]