From 50620f98af568bb61c29bf2f7350cf455367813a Mon Sep 17 00:00:00 2001
From: Kevin B Kenny <kennykb@acm.org>
Date: Wed, 6 Dec 2006 16:36:58 +0000
Subject: Improved error reporting in test expr-47.12

---
 ChangeLog       |  5 +++++
 tests/expr.test | 26 ++++++++++++++++++--------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 346febe..c6f5429 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-06  Kevin Kenny  <kennykb@acm.org>
+
+	* tests/expr.test (expr-47.12): Improved error reporting in hopes
+	of having more information to pursue [Bug 1609936].
+	
 2006-11-28  Andreas Kupries  <andreask@activestate.com>
 
 	TIP#291 IMPLEMENTATION
diff --git a/tests/expr.test b/tests/expr.test
index 51b66bd..daab2f4 100644
--- a/tests/expr.test
+++ b/tests/expr.test
@@ -10,7 +10,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: expr.test,v 1.66 2006/12/01 20:00:00 kennykb Exp $
+# RCS: @(#) $Id: expr.test,v 1.67 2006/12/06 16:37:00 kennykb Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2.1
@@ -6631,18 +6631,28 @@ test expr-47.11 {isqrt of zero} {
 } 0
 
 test expr-47.12 {isqrt of various sizes of integer} {
-    for {set i 0} {$i < 3000} {incr i} {
+    set faults 0
+    for {set i 0} {$faults < 10 && $i <= 1024} {incr i} {
 	set root [expr {1 << $i}]
 	set rm1 [expr {$root - 1}]
 	set arg [expr {1 << (2 * $i)}]
-	if {isqrt($arg-1) != $rm1} {
-	    append trouble "i = " $i ": isqrt( " $arg "-1) != " $rm1 "\n"
+	set tval [expr {isqrt($arg-1)}]
+	if {$tval != $rm1} {
+	    append trouble "i = " $i ": isqrt(" $arg "-1) == " $tval \
+		" != " $rm1 "\n"
+	    incr faults
 	}
-	if {isqrt($arg) != $root} {
-	    append trouble "i = " $i ": isqrt( " $arg ") != " $root "\n"
+	set tval [expr {isqrt($arg)}]
+	if {$tval != $root} {
+	    append trouble "i = " $i ": isqrt(" $arg ") == " $tval \
+		" != " $root "\n"
+	    incr faults
 	}
-	if {isqrt($arg+1) != $root} {
-	    append trouble "i = " $i ": isqrt( " $arg "+1) != " $root "\n"
+	set tval [expr {isqrt($arg+1)}]
+	if {$tval != $root} {
+	    append trouble "i = " $i ": isqrt(" $arg "+1) == " $tval \
+		" != " $root "\n"
+	    incr faults
 	}
     }
     set trouble
-- 
cgit v0.12