[m-dev.] diff: minimal model tabling, part 3

[Fergus Henderson]

On 19-Apr-1999, Zoltan Somogyi <zs at cs.mu.OZ.AU> wrote:
> 
> Index: tests/tabling/Mmakefile
> +# make sure that all the tests here have a GRADEFLAGS that specifies
> +# --use-minimal-model
> +NONDET_PROGS = \
> +	coup \
> +	coup_det_frame \
> +	coup_no_commit \
> +	coup_non_tabled_frame \
> +	generator_in_commit \
> +	repeat \
> +	seq
...
> +ifneq "$(findstring .gc,$(GRADE))" ""
> +	ifneq "$(findstring mm,$(GRADE))" ""
> +		PROGS=$(SIMPLE_PROGS)
> +	else
> +		PROGS=$(SIMPLE_PROGS) $(NONDET_PROGS)
> +	endif
> +else
> +	PROGS=
> +endif

(1) Shouldn't that check for `.mm' rather than `mm'?

(2) Currently we don't test or install the `.mm' grades in the
    nightly tests.  So this will mean that the $(NONDET_PROGS)
    will currently not be tested at all, unless you do so manually.

...
> +MCFLAGS-coup			= --use-minimal-model
> +MCFLAGS-coup_det_frame	= --use-minimal-model
> +MCFLAGS-coup_no_commit	= --use-minimal-model
> +MCFLAGS-coup_non_tabled_frame = --use-minimal-model
> +MCFLAGS-generator_in_commit	= --use-minimal-model
> +MCFLAGS-repeat		= --use-minimal-model
> +MCFLAGS-seq 			= --use-minimal-model

This is neither necessary nor sufficient.
It is not sufficient because you need to
pass --use-minimal-model to mgnuc, ml, etc.:
you should be setting GRADEFLAGS-foo rather than MCFLAGS-foo.
It is not necessary because you already check that the grade
contains `mm'. 

tests/valid/Mmakefile
> +ifneq "$(findstring mm,$(GRADE))" ""

Shouldn't that check for `.mm' rather than `mm'?

> +GRADEFLAGS-complex_failure	= --use-trail
> +GRADEFLAGS-semi_fail_in_non_ite	= --use-trail

This is not necessary, since you already checked that the
grade contains `.mm'.

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>  |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3        |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------