[m-rev.] for review: fix readline problems

[Fergus Henderson]

On 11-Dec-2001, Mark Brown <dougl at cs.mu.OZ.AU> wrote:
> On 11-Dec-2001, Fergus Henderson <fjh at cs.mu.OZ.AU> wrote:
> > The nightly tests have been failing on ceres, due to a problem
> > with readline 4.2 issuing unsuppressable runtime warnings.
> > This change should, I hope, fix that problem.
> 
> This change looks fine to me.  It should be ok to go ahead and
> commit provided it has passed testing.

A couple of minor things showed up in testing.
Hence the following relative diff.  I'll go ahead and commit this now.

--- log.old	Tue Dec 11 15:43:40 2001
+++ log		Tue Dec 11 19:55:16 2001
@@ -25,6 +25,7 @@
 
 configure.in:
 runtime/mercury_conf.h.in:
+runtime/RESERVED_MACRO_NAMES:
 	Check for the existence of isatty().
 
 trace/mercury_trace_readline.c:
diff -u tests/debugger/Mmakefile tests/debugger/Mmakefile
--- tests/debugger/Mmakefile
+++ tests/debugger/Mmakefile
@@ -34,7 +34,6 @@
 	field_names			\
 	implied_instance		\
 	interpreter			\
-	interactive			\
 	loopcheck			\
 	lval_desc_array			\
 	multi_parameter			\
@@ -59,6 +58,14 @@
 
 GRADEFLAGS-interactive = --pic-reg
 MLFLAGS-interactive = --shared
+
+# Since the `interactive' test case requires the use of shared libraries,
+# this means it won't work properly if MERCURY_LIBS is set to point
+# to static libraries (as is done by tools/bootcheck and tools/lmc).
+# So we only enable it if MERCURY_LIBS is not set.
+ifeq "$(origin MERCURY_LIBS)" "undefined"
+	RETRY_PROGS := $(RETRY_PROGS) interactive
+endif
 
 # Debugging doesn't yet don't work in MLDS grades (hl*), and the retry command
 # doesn't and will not work in deep profiling grades (profdeep).
only in patch2:
--- runtime/RESERVED_MACRO_NAMES	2 Nov 2001 06:23:50 -0000	1.5
+++ runtime/RESERVED_MACRO_NAMES	11 Dec 2001 08:26:29 -0000
@@ -82,6 +82,7 @@
 HAVE_FSTAT
 HAVE_GETHOSTNAME
 HAVE_GETPAGESIZE
+HAVE_ISATTY
 HAVE_MEMALIGN
 HAVE_MEMMOVE
 HAVE_MPROTECT

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------