[m-rev.] diff: make tests/analysis run in nightly tests

[Peter Wang]

Estimated hours taken: 0.2
Branches: main

The tests in the `tests/analysis' directory fail to run during the nightly
tests because then `--intermodule-optimisation' might be present in
EXTRA_MCFLAGS, which is incompatible with `--intermodule-analysis'.

tests/analysis/Mmakefile:
tests/analysis/ctgc/Mmakefile:
tests/analysis/excp/Mmakefile:
tests/analysis/ext/Mmakefile:
tests/analysis/sharing/Mmakefile:
tests/analysis/table/Mmakefile:
tests/analysis/trail/Mmakefile:
tests/analysis/unused_args/Mmakefile:
	Delete `--intermodule-optimisation' and also
	`--transitive-intermodule-optimisation' from EXTRA_MCFLAGS when
	running in these directories.

Index: analysis/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/analysis/Mmakefile,v
retrieving revision 1.2
diff -u -r1.2 Mmakefile
--- analysis/Mmakefile	6 Jun 2008 01:11:39 -0000	1.2
+++ analysis/Mmakefile	12 Jun 2008 00:58:42 -0000
@@ -2,6 +2,11 @@
 
 THIS_DIR = analysis
 
+# Delete options which are incompatible with --intermodule-analysis.
+# These are currently set for nightly tests. 
+override EXTRA_MCFLAGS := $(patsubst --intermodule-opt%,,$(EXTRA_MCFLAGS))
+override EXTRA_MCFLAGS := $(patsubst --transitive-%,,$(EXTRA_MCFLAGS))
+
 #-----------------------------------------------------------------------------#
 
 SUBDIRS = \
Index: analysis/ctgc/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/analysis/ctgc/Mmakefile,v
retrieving revision 1.2
diff -u -r1.2 Mmakefile
--- analysis/ctgc/Mmakefile	6 Jun 2008 01:11:39 -0000	1.2
+++ analysis/ctgc/Mmakefile	12 Jun 2008 00:57:14 -0000
@@ -2,6 +2,11 @@
 
 THIS_DIR = analysis/ctgc
 
+# Delete options which are incompatible with --intermodule-analysis.
+# These are currently set for nightly tests. 
+override EXTRA_MCFLAGS := $(patsubst --intermodule-opt%,,$(EXTRA_MCFLAGS))
+override EXTRA_MCFLAGS := $(patsubst --transitive-%,,$(EXTRA_MCFLAGS))
+
 #-----------------------------------------------------------------------------#
 
 SUBDIRS=
Index: analysis/excp/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/analysis/excp/Mmakefile,v
retrieving revision 1.1
diff -u -r1.1 Mmakefile
--- analysis/excp/Mmakefile	5 Jun 2008 06:25:18 -0000	1.1
+++ analysis/excp/Mmakefile	12 Jun 2008 00:57:14 -0000
@@ -2,6 +2,11 @@
 
 THIS_DIR = analysis/excp
 
+# Delete options which are incompatible with --intermodule-analysis.
+# These are currently set for nightly tests. 
+override EXTRA_MCFLAGS := $(patsubst --intermodule-opt%,,$(EXTRA_MCFLAGS))
+override EXTRA_MCFLAGS := $(patsubst --transitive-%,,$(EXTRA_MCFLAGS))
+
 #-----------------------------------------------------------------------------#
 
 SUBDIRS=
Index: analysis/ext/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/analysis/ext/Mmakefile,v
retrieving revision 1.1
diff -u -r1.1 Mmakefile
--- analysis/ext/Mmakefile	5 Jun 2008 06:25:19 -0000	1.1
+++ analysis/ext/Mmakefile	12 Jun 2008 00:57:14 -0000
@@ -2,6 +2,11 @@
 
 THIS_DIR = analysis/external
 
+# Delete options which are incompatible with --intermodule-analysis.
+# These are currently set for nightly tests. 
+override EXTRA_MCFLAGS := $(patsubst --intermodule-opt%,,$(EXTRA_MCFLAGS))
+override EXTRA_MCFLAGS := $(patsubst --transitive-%,,$(EXTRA_MCFLAGS))
+
 #-----------------------------------------------------------------------------#
 
 SUBDIRS=
Index: analysis/sharing/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/analysis/sharing/Mmakefile,v
retrieving revision 1.1
diff -u -r1.1 Mmakefile
--- analysis/sharing/Mmakefile	5 Jun 2008 06:25:19 -0000	1.1
+++ analysis/sharing/Mmakefile	12 Jun 2008 00:57:14 -0000
@@ -2,6 +2,11 @@
 
 THIS_DIR = analysis/structure_sharing
 
+# Delete options which are incompatible with --intermodule-analysis.
+# These are currently set for nightly tests. 
+override EXTRA_MCFLAGS := $(patsubst --intermodule-opt%,,$(EXTRA_MCFLAGS))
+override EXTRA_MCFLAGS := $(patsubst --transitive-%,,$(EXTRA_MCFLAGS))
+
 #-----------------------------------------------------------------------------#
 
 SUBDIRS=
Index: analysis/table/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/analysis/table/Mmakefile,v
retrieving revision 1.1
diff -u -r1.1 Mmakefile
--- analysis/table/Mmakefile	5 Jun 2008 06:25:19 -0000	1.1
+++ analysis/table/Mmakefile	12 Jun 2008 00:57:14 -0000
@@ -2,6 +2,11 @@
 
 THIS_DIR = analysis/table
 
+# Delete options which are incompatible with --intermodule-analysis.
+# These are currently set for nightly tests. 
+override EXTRA_MCFLAGS := $(patsubst --intermodule-opt%,,$(EXTRA_MCFLAGS))
+override EXTRA_MCFLAGS := $(patsubst --transitive-%,,$(EXTRA_MCFLAGS))
+
 #-----------------------------------------------------------------------------#
 
 SUBDIRS=
Index: analysis/trail/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/analysis/trail/Mmakefile,v
retrieving revision 1.1
diff -u -r1.1 Mmakefile
--- analysis/trail/Mmakefile	5 Jun 2008 06:25:20 -0000	1.1
+++ analysis/trail/Mmakefile	12 Jun 2008 00:57:14 -0000
@@ -2,6 +2,11 @@
 
 THIS_DIR = analysis/trail
 
+# Delete options which are incompatible with --intermodule-analysis.
+# These are currently set for nightly tests. 
+override EXTRA_MCFLAGS := $(patsubst --intermodule-opt%,,$(EXTRA_MCFLAGS))
+override EXTRA_MCFLAGS := $(patsubst --transitive-%,,$(EXTRA_MCFLAGS))
+
 #-----------------------------------------------------------------------------#
 
 SUBDIRS=
Index: analysis/unused_args/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/analysis/unused_args/Mmakefile,v
retrieving revision 1.1
diff -u -r1.1 Mmakefile
--- analysis/unused_args/Mmakefile	5 Jun 2008 06:25:20 -0000	1.1
+++ analysis/unused_args/Mmakefile	12 Jun 2008 00:57:14 -0000
@@ -2,6 +2,11 @@
 
 THIS_DIR = analysis/unused_args
 
+# Delete options which are incompatible with --intermodule-analysis.
+# These are currently set for nightly tests. 
+override EXTRA_MCFLAGS := $(patsubst --intermodule-opt%,,$(EXTRA_MCFLAGS))
+override EXTRA_MCFLAGS := $(patsubst --transitive-%,,$(EXTRA_MCFLAGS))
+
 #-----------------------------------------------------------------------------#
 
 SUBDIRS=


--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------