[m-dev.] diff: runtests: support `--target asm'

Fergus Henderson fjh at cs.mu.OZ.AU
Wed Jan 31 22:34:09 AEDT 2001
Previous message: [m-dev.] For review: additions to array.m
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Estimated hours taken: 0.5

Add support to the test suite for testing the GCC back-end
(`--target asm') version of the compiler.

tests/handle_options:
	Add a `-t <target>' / `--target <target>' option.
	If this is set, include `--target <target>' in $mmakeopts,
	so that it gets passed to mmake.

tests/*/runtests:
tests/*/*/runtests:
	Put `-k' after $mmakeopts, since `-k' is a `make' option,
	not an `mmake' option, and `mmake' options (in particular
	`--target') must precede all make options.

Workspace: /home/hg/fjh/gcc-cvs/gcc/mercury
Index: tests/handle_options
===================================================================
RCS file: /home/mercury1/repository/tests/handle_options,v
retrieving revision 1.6
diff -u -d -r1.6 handle_options
--- tests/handle_options	1999/10/07 11:13:05	1.6
+++ tests/handle_options	2001/01/31 11:29:50
@@ -11,10 +11,13 @@
 		Pass EXTRA_MLFLAGS=<mlflags> as an option to \`mmake check'.
 	-g <grade>, --grade <grade>
 		Pass GRADE=<grade> as an option to \`mmake check'.
+	-t <target>, --target <target>
+		Pass \`--target <target>' as an option to \`mmake check'.
 	-j <num-jobs>, --jobs <num-jobs>
 		Run using <num-jobs> different parallel processes.
 "
 
+targetopt=""
 jfactor=""
 flagsopt=""
 mgnucflagsopt=""
@@ -62,6 +65,9 @@
 	--jobs*)
 		jfactor="--jobs` expr $1 : '--jobs\(.*\)' `" ;;
 
+	-t|--target)
+		target_opt="--target '$2'"; shift ;;
+
 	--)	
 		shift; break ;;
 	-*)
@@ -80,5 +86,6 @@
 	exit 1
 fi
 
-mmakeopts="$jfactor $flagsopt $mgnucflagsopt $cflagsopt $mlflagsopt $gradeopt"
-runtestopts="$jfactor $mflag $cflag $lflag $fflag $gflag"
+mmakeopts="$target_opt $jfactor $flagsopt $mgnucflagsopt $cflagsopt \
+	$mlflagsopt $gradeopt"
+runtestopts="$target_opt $jfactor $mflag $cflag $lflag $fflag $gflag"
Index: tests/debugger/declarative/runtests
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/runtests,v
retrieving revision 1.5
diff -u -d -r1.5 runtests
--- tests/debugger/declarative/runtests	2000/01/13 06:28:24	1.5
+++ tests/debugger/declarative/runtests	2001/01/31 11:26:50
@@ -7,7 +7,7 @@
 . ../../startup
 
 eval mmake $mmakeopts depend || exit 1
-eval mmake -k $mmakeopts check
+eval mmake $mmakeopts -k check
 checkstatus=$?
 
 cat *.res > .allres
Index: tests/general/accumulator/runtests
===================================================================
RCS file: /home/mercury1/repository/tests/general/accumulator/runtests,v
retrieving revision 1.9
diff -u -d -r1.9 runtests
--- tests/general/accumulator/runtests	2000/06/28 07:42:59	1.9
+++ tests/general/accumulator/runtests	2001/01/31 11:26:52
@@ -16,7 +16,7 @@
 . ../../startup
 
 eval mmake $mmakeopts depend || exit 1
-eval mmake -k $mmakeopts check
+eval mmake $mmakeopts -k check
 checkstatus=$?
 
 cat *.res > .allres
Index: tests/hard_coded/exceptions/runtests
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/exceptions/runtests,v
retrieving revision 1.2
diff -u -d -r1.2 runtests
--- tests/hard_coded/exceptions/runtests	2000/01/20 06:32:51	1.2
+++ tests/hard_coded/exceptions/runtests	2001/01/31 11:26:55
@@ -7,7 +7,7 @@
 . ../../startup
 
 eval mmake $mmakeopts depend || exit 1
-eval mmake -k $mmakeopts check
+eval mmake $mmakeopts -k check
 checkstatus=$?
 
 cat *.res > .allres
Index: tests/hard_coded/purity/runtests
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/purity/runtests,v
retrieving revision 1.1
diff -u -d -r1.1 runtests
--- tests/hard_coded/purity/runtests	2000/04/22 07:12:36	1.1
+++ tests/hard_coded/purity/runtests	2001/01/31 11:27:00
@@ -7,7 +7,7 @@
 . ../../startup
 
 eval mmake $mmakeopts depend || exit 1
-eval mmake -k $mmakeopts check
+eval mmake $mmakeopts -k check
 checkstatus=$?
 
 cat *.res > .allres
Index: tests/hard_coded/sub-modules/runtests
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/sub-modules/runtests,v
retrieving revision 1.3
diff -u -d -r1.3 runtests
--- tests/hard_coded/sub-modules/runtests	1999/10/03 08:20:13	1.3
+++ tests/hard_coded/sub-modules/runtests	2001/01/31 11:27:05
@@ -11,7 +11,7 @@
 jfactor=-j1
 
 eval mmake $mmakeopts $jfactor depend || exit 1
-eval mmake -k $mmakeopts $jfactor check
+eval mmake $mmakeopts -k $jfactor check
 checkstatus=$?
 
 cat *.res > .allres
Index: tests/hard_coded/typeclasses/runtests
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/typeclasses/runtests,v
retrieving revision 1.2
diff -u -d -r1.2 runtests
--- tests/hard_coded/typeclasses/runtests	1999/10/03 08:20:15	1.2
+++ tests/hard_coded/typeclasses/runtests	2001/01/31 11:27:07
@@ -7,7 +7,7 @@
 . ../../startup
 
 eval mmake $mmakeopts depend || exit 1
-eval mmake -k $mmakeopts check
+eval mmake $mmakeopts -k check
 checkstatus=$?
 
 cat *.res > .allres
Index: tests/invalid/purity/runtests
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/purity/runtests,v
retrieving revision 1.1
diff -u -d -r1.1 runtests
--- tests/invalid/purity/runtests	2000/04/22 07:12:53	1.1
+++ tests/invalid/purity/runtests	2001/01/31 11:27:10
@@ -7,7 +7,7 @@
 . ../../startup
 
 eval mmake $mmakeopts depend || exit 1
-eval mmake -k $mmakeopts check
+eval mmake $mmakeopts -k check
 checkstatus=$?
 
 cat *.err_res > .allres
Index: tests/benchmarks/runtests
===================================================================
RCS file: /home/mercury1/repository/tests/benchmarks/runtests,v
retrieving revision 1.7
diff -u -d -r1.7 runtests
--- tests/benchmarks/runtests	1999/10/03 08:20:18	1.7
+++ tests/benchmarks/runtests	2001/01/31 11:21:42
@@ -16,7 +16,7 @@
 . ../startup
 
 eval mmake $mmakeopts depend || exit 1
-eval mmake -k $mmakeopts check
+eval mmake $mmakeopts -k check
 checkstatus=$?
 
 cat *.res > .allres
Index: tests/debugger/runtests
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/runtests,v
retrieving revision 1.8
diff -u -d -r1.8 runtests
--- tests/debugger/runtests	1999/10/03 08:20:20	1.8
+++ tests/debugger/runtests	2001/01/31 11:23:49
@@ -22,7 +22,7 @@
 . ../startup
 
 eval mmake $mmakeopts depend_local || exit 1
-eval mmake -k $mmakeopts check_local
+eval mmake $mmakeopts -k check_local
 checkstatus=$?
 
 cat *.res > .allres
Index: tests/general/runtests
===================================================================
RCS file: /home/mercury1/repository/tests/general/runtests,v
retrieving revision 1.8
diff -u -d -r1.8 runtests
--- tests/general/runtests	1999/10/03 08:20:22	1.8
+++ tests/general/runtests	2001/01/31 11:23:52
@@ -31,7 +31,7 @@
 . ../startup
 
 eval mmake $mmakeopts depend_local || exit 1
-eval mmake -k $mmakeopts check_local
+eval mmake $mmakeopts -k check_local
 checkstatus=$?
 
 cat *.res > .allres
Index: tests/hard_coded/runtests
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/runtests,v
retrieving revision 1.8
diff -u -d -r1.8 runtests
--- tests/hard_coded/runtests	1999/10/03 08:20:24	1.8
+++ tests/hard_coded/runtests	2001/01/31 11:23:56
@@ -22,7 +22,7 @@
 . ../startup
 
 eval mmake $mmakeopts depend_local || exit 1
-eval mmake -k $mmakeopts check_local
+eval mmake $mmakeopts -k check_local
 checkstatus=$?
 
 cat *.res > .allres
Index: tests/invalid/runtests
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/runtests,v
retrieving revision 1.7
diff -u -d -r1.7 runtests
--- tests/invalid/runtests	1999/10/03 08:20:27	1.7
+++ tests/invalid/runtests	2001/01/31 11:23:59
@@ -6,7 +6,7 @@
 . ../startup
 
 eval mmake $mmakeopts depend || exit 1
-eval mmake -k $mmakeopts check
+eval mmake $mmakeopts -k check
 checkstatus=$?
 
 cat *.err_res > .allres
Index: tests/misc_tests/runtests
===================================================================
RCS file: /home/mercury1/repository/tests/misc_tests/runtests,v
retrieving revision 1.6
diff -u -d -r1.6 runtests
--- tests/misc_tests/runtests	1999/10/03 08:20:29	1.6
+++ tests/misc_tests/runtests	2001/01/31 11:25:13
@@ -7,7 +7,7 @@
 . ../startup
 
 eval mmake $mmakeopts depend || exit 1
-eval mmake -k $mmakeopts check
+eval mmake $mmakeopts -k check
 checkstatus=$?
 
 cat *.res > .allres
Index: tests/tabling/runtests
===================================================================
RCS file: /home/mercury1/repository/tests/tabling/runtests,v
retrieving revision 1.3
diff -u -d -r1.3 runtests
--- tests/tabling/runtests	1999/10/03 08:20:31	1.3
+++ tests/tabling/runtests	2001/01/31 11:25:15
@@ -7,7 +7,7 @@
 . ../startup
 
 eval mmake $mmakeopts depend || exit 1
-eval mmake -k $mmakeopts check
+eval mmake $mmakeopts -k check
 checkstatus=$?
 
 cat *.res > .allres
Index: tests/term/runtests
===================================================================
RCS file: /home/mercury1/repository/tests/term/runtests,v
retrieving revision 1.6
diff -u -d -r1.6 runtests
--- tests/term/runtests	1999/10/03 08:20:33	1.6
+++ tests/term/runtests	2001/01/31 11:25:18
@@ -7,7 +7,7 @@
 . ../startup
 
 eval mmake $mmakeopts depend || exit 1
-eval mmake -k $mmakeopts check
+eval mmake $mmakeopts -k check
 checkstatus=$?
 
 cat *.trans_opt_res > .allres
Index: tests/valid/runtests
===================================================================
RCS file: /home/mercury1/repository/tests/valid/runtests,v
retrieving revision 1.9
diff -u -d -r1.9 runtests
--- tests/valid/runtests	1999/10/17 15:42:59	1.9
+++ tests/valid/runtests	2001/01/31 11:25:20
@@ -6,7 +6,7 @@
 . ../startup
 
 eval mmake $mmakeopts depend || exit 1
-eval mmake -k $mmakeopts check
+eval mmake $mmakeopts -k check
 checkstatus=$?
 
 objs=`eval mmake $mmakeopts printobjs`
Index: tests/warnings/runtests
===================================================================
RCS file: /home/mercury1/repository/tests/warnings/runtests,v
retrieving revision 1.9
diff -u -d -r1.9 runtests
--- tests/warnings/runtests	2000/02/14 00:20:18	1.9
+++ tests/warnings/runtests	2001/01/31 11:25:22
@@ -6,7 +6,7 @@
 . ../startup
 
 eval mmake $mmakeopts depend || exit 1
-eval mmake -k $mmakeopts check
+eval mmake $mmakeopts -k check
 checkstatus=$?
 
 cat *.res_compile *.res_error > .allres

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
                                    |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- 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
--------------------------------------------------------------------------
Previous message: [m-dev.] For review: additions to array.m
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the developers mailing list