* tests/expr.test (expr-22.*): Marked as non-portable because it

	seems that these tests have an annoying tendency to fail in
	unexpected ways.  [Bugs 584825, 584950, 585986]

2 files changed, 22 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 16bfabe..d7ed188 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-31  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
+
+	* tests/expr.test (expr-22.*): Marked as non-portable because it
+	seems that these tests have an annoying tendency to fail in
+	unexpected ways.  [Bugs 584825, 584950, 585986]
+
 2002-07-30  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
 
 	* tests/io.test: 
diff --git a/tests/expr.test b/tests/expr.test
index 90ace83..c06080f 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.16 2002/07/22 10:04:17 dkf Exp $
+# RCS: @(#) $Id: expr.test,v 1.17 2002/07/31 09:33:45 dkf Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
@@ -775,31 +775,34 @@ test expr-21.10 {non-numeric boolean literals} {expr !on   } 0
 test expr-21.11 {non-numeric boolean literals} {expr !no   } 1
 test expr-21.12 {non-numeric boolean literals} {expr !yes  } 0
 
-# Test for non-numeric float handling
-test expr-22.1 {non-numeric floats} {
+# Test for non-numeric float handling.
+#
+# These are non-portable because strtod()-support for "Inf" and "NaN"
+# is so wildly variable.  This sucks...
+test expr-22.1 {non-numeric floats} nonPortable {
     list [catch {expr {NaN + 1}} msg] $msg
-} {1 {domain error: argument not in valid range}}
-test expr-22.2 {non-numeric floats} {
+} {1 {can't use non-numeric floating-point value as operand of "+"}}
+test expr-22.2 {non-numeric floats} nonPortable {
     list [catch {expr {Inf + 1}} msg] $msg
 } {1 {can't use infinite floating-point value as operand of "+"}}
-test expr-22.3 {non-numeric floats} {
+test expr-22.3 {non-numeric floats} nonPortable {
     set nan NaN
     list [catch {expr {$nan + 1}} msg] $msg
-} {1 {domain error: argument not in valid range}}
-test expr-22.4 {non-numeric floats} {
+} {1 {can't use non-numeric floating-point value as operand of "+"}}
+test expr-22.4 {non-numeric floats} nonPortable {
     set inf Inf
     list [catch {expr {$inf + 1}} msg] $msg
 } {1 {can't use infinite floating-point value as operand of "+"}}
-test expr-22.5 {non-numeric floats} {
+test expr-22.5 {non-numeric floats} nonPortable {
     list [catch {expr NaN} msg] $msg
 } {1 {domain error: argument not in valid range}}
-test expr-22.6 {non-numeric floats} {
+test expr-22.6 {non-numeric floats} nonPortable {
     list [catch {expr Inf} msg] $msg
 } {1 {floating-point value too large to represent}}
-test expr-22.7 {non-numeric floats} {
+test expr-22.7 {non-numeric floats} nonPortable {
     list [catch {expr {1 / NaN}} msg] $msg
-} {1 {domain error: argument not in valid range}}
-test expr-22.8 {non-numeric floats} knownBug {
+} {1 {can't use non-numeric floating-point value as operand of "/"}}
+test expr-22.8 {non-numeric floats} nonPortable {
     list [catch {expr {1 / Inf}} msg] $msg
 } {1 {can't use infinite floating-point value as operand of "/"}}