[m-rev.] diff: more string_format test fine-tuning

[Peter Ross]

Hi,


===================================================================


Estimated hours taken: 0.5
Branches: main

More fixes for the string_format tests.

tests/general/string_format/Mmakefile:
    Disable string_format_o on Solaris 5.1 instead of taifun.
    Disable floating point tests on DEC OSF1 due to problems with
    denormal numbers.

tests/general/string_format/string_format_d.exp2:
tests/general/string_format/string_format_o.exp2:
tests/general/string_format/string_format_u.exp2:
tests/general/string_format/string_format_x.exp2:
    Add expected output for when int is 64 bits.


Index: tests/general/string_format/Mmakefile
===================================================================
RCS file: /home/staff/zs/imp/tests/general/string_format/Mmakefile,v
retrieving revision 1.5
diff -u -r1.5 Mmakefile
--- tests/general/string_format/Mmakefile	21 Nov 2002 15:29:05 -0000	1.5
+++ tests/general/string_format/Mmakefile	22 Nov 2002 13:58:37 -0000
@@ -17,21 +17,33 @@
 		string_format_u \
 		string_format_x 
 
-	# On taifun there is a buggy version of sprintf which gives
-	# incorrect output for string_format_o so don't test this.
-ifneq "$(findstring taifun,$(HOST))" ""
-	PROGS0=$(filter-out string_format_o,$(STRING_FORMAT_PROGS))
+	# The tests don't work in the *.agc grades, because I think they
+	# take too long to finsih and the CPU time limit is breached.
+ifneq "$(findstring .agc,$(GRADE))" ""
+	PROGS0=
 else
 	PROGS0=$(STRING_FORMAT_PROGS)
 endif
 
-	# The tests don't work in the *.agc grades, because I think they
-	# take too long to finsih and the CPU time limit is breached.
-ifneq "$(findstring .agc,$(GRADE))" ""
-	PROGS=
+	# On solaris 5.7 string_format_o fails because of a buggy
+	# sprintf implementation.
+SOLARIS_FAILURES=string_format_o
+
+	# On Dec OSF 5.1 the floating point tests fail because
+	# the denormal floats aren't being printed correctly.
+OSF1_FAILURES=string_format_e string_format_f string_format_g
+
+UNAME=$(shell uname -r -s)
+ifneq "$(findstring SunOS 5.7,$(UNAME))" ""
+	PROGS=$(filter-out $(SOLARIS_FAILURES),$(PROGS0))
 else
+  ifneq "$(findstring OSF1 V5.1,$(UNAME))" ""
+	PROGS=$(filter-out $(OSF1_FAILURES),$(PROGS0))
+  else
 	PROGS=$(PROGS0)
+  endif
 endif
+
 
 SUBDIRS = 
 TESTS=$(PROGS)
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------