In .:

* Makefile (SUBDIRS): Just list Test.
(mb-parser.cs): Depend on jay/skeleton.cs.

In Test:
* Makefile: New.
* test-mbas.make (thisdir): Remove.
(COMPILER): Use $(BASCOMPILE).
(run-test-local): Quote arguments.
* test-mbas.pl ($Runtime): Don't try to auto-detect.
* errors/Makefile, misc/Makefile, tests/Makefile, dlls/Makefile: Update.

svn path=/trunk/mcs/; revision=36539

diff --git a/mcs/mbas/ChangeLog b/mcs/mbas/ChangeLog
index f6d3fba0c416ddec0136eaca720ae285ffa0012e..cf6c29c8a6b14714add12620284d8f21957246a0 100644 (file)
--- a/mcs/mbas/ChangeLog
+++ b/mcs/mbas/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-25  Raja R Harinath  <rharinath@novell.com>
+
+       * Makefile (SUBDIRS): Just list Test.
+       (mb-parser.cs): Depend on jay/skeleton.cs.
+
 2004-11-25  Raja R Harinath  <rharinath@novell.com>
 
        Update to changes in jay/skeleton.cs.

diff --git a/mcs/mbas/Makefile b/mcs/mbas/Makefile
index 54ce8d64d63b7ed7048d56f5a6250161f3efaa66..e0fb7b310f0ffb22c5b641663f120075702de67e 100644 (file)
--- a/mcs/mbas/Makefile
+++ b/mcs/mbas/Makefile
@@ -1,5 +1,5 @@
 thisdir = mbas
-SUBDIRS = Test/misc Test/tests Test/errors
+SUBDIRS = Test
 include ../build/rules.make
 
 PROGRAM = mbas.exe
@@ -16,7 +16,7 @@ CONSOLIDATED_TEST_RESULTS_FILE = TestResults.log
 
 include ../build/executable.make
 
-mb-parser.cs: mb-parser.jay
+mb-parser.cs: mb-parser.jay $(topdir)/jay/skeleton.cs
        $(topdir)/jay/jay -ctv <$(topdir)/jay/skeleton.cs $< >$@
 
 consolidate-test-results:

diff --git a/mcs/mbas/Test/ChangeLog b/mcs/mbas/Test/ChangeLog
index d3f1a741fde15c45a6b038ae7163694dd9ce0655..977ef13b66dad3368330d332d01e488b2eacc4ce 100644 (file)
--- a/mcs/mbas/Test/ChangeLog
+++ b/mcs/mbas/Test/ChangeLog
@@ -1,3 +1,12 @@
+2004-11-25  Raja R Harinath  <rharinath@novell.com>
+
+       * Makefile: New.
+       * test-mbas.make (thisdir): Remove.
+       (COMPILER): Use $(BASCOMPILE).
+       (run-test-local): Quote arguments.
+       * test-mbas.pl ($Runtime): Don't try to auto-detect.
+       * errors/Makefile, misc/Makefile, tests/Makefile, dlls/Makefile: Update.
+
 2004-11-22  Jambunathan K  <kjambunathan@novell.com>
        * EnumD.vb: New positive test case.
 

diff --git a/mcs/mbas/Test/Makefile b/mcs/mbas/Test/Makefile
new file mode 100644 (file)
index 0000000..dc83590
--- /dev/null
+++ b/mcs/mbas/Test/Makefile
@@ -0,0 +1,11 @@
+thisdir = mbas/Test
+SUBDIRS = misc dlls tests errors
+
+DISTFILES = test-mbas.make test-mbas.pl
+
+include ../../build/rules.make
+
+all-local $(STD_TARGETS:=-local):
+       @:
+
+dist-local: dist-default

diff --git a/mcs/mbas/Test/dlls/Makefile b/mcs/mbas/Test/dlls/Makefile
index 82cd5943bec1eadae2e8fc4fdb96816ea62ca69e..0d370d09684c7a606bfb081f58398a005ab52692 100644 (file)
--- a/mcs/mbas/Test/dlls/Makefile
+++ b/mcs/mbas/Test/dlls/Makefile
@@ -1,5 +1,6 @@
-thisdir = dlls
-SUBDIRS = 
+thisdir = mbas/Test/dlls
+
+include ../../../build/rules.make
 
 include ../test-mbas.make
 

diff --git a/mcs/mbas/Test/errors/Makefile b/mcs/mbas/Test/errors/Makefile
index 82cd5943bec1eadae2e8fc4fdb96816ea62ca69e..8daa8ee25842b9c452c9573c64922d60c97bc089 100644 (file)
--- a/mcs/mbas/Test/errors/Makefile
+++ b/mcs/mbas/Test/errors/Makefile
@@ -1,5 +1,6 @@
-thisdir = dlls
-SUBDIRS = 
+thisdir = mbas/Test/errors
+
+include ../../../build/rules.make
 
 include ../test-mbas.make
 

diff --git a/mcs/mbas/Test/misc/Makefile b/mcs/mbas/Test/misc/Makefile
index db0e50eb32ac394ac267acbc3b72f0c00ff46f6e..a85d9b94581f890ad1d28e41bfa9b9d3f12979ec 100644 (file)
--- a/mcs/mbas/Test/misc/Makefile
+++ b/mcs/mbas/Test/misc/Makefile
@@ -1,23 +1,38 @@
-CLEAN_FILES = y.output WriteOK.exe x.exe
+thisdir = mbas/Test/misc
 
-run-test: WriteOK.exe
-       mono --debug WriteOK.exe --sayho /about -say:this,that,those /say:what?
+include ../../../build/rules.make
+
+LOCAL_MBAS_FLAGS = --verbosegetoptions --stacktrace
+
+test-local: WriteOK.exe
+
+run-test-local: WriteOK.exe
+       $(RUNTIME) --debug WriteOK.exe --sayho /about -say:this,that,those /say:what?
+
+run-test-ondotnet-local: WriteOK.exe
+       ./WriteOK.exe --sayho /about -say:this,that,those /say:what?
 
 WriteOK.exe: Makefile *.vb *.mbs
-       mbas --verbosegetoptions --stacktrace --reference=Mono.GetOptions -r:System.Data,System.Messaging --main WriteOK WriteOK.vb WriteOK2.mbs AssemblyInfo.vb
+       $(BASCOMPILE) --reference=Mono.GetOptions -r:System.Data,System.Messaging --main WriteOK WriteOK.vb WriteOK2.mbs AssemblyInfo.vb
 
-verbose: 
-        mbas --verbosegetoptions --verbose --stacktrace /r:Mono.GetOptions /r:System.Data,System.Windows.Forms --main WriteOK WriteOK.vb WriteOK2.mbs AssemblyInfo.vb 
+verbose:
+       $(MAKE) LOCAL_MBAS_FLAGS='--verbosegetoptions --verbose --stacktrace' WriteOK.exe
 
-test-aspx: aspx_temp.vb
-       mbas --stacktrace --verbosegetoptions /target:library /r:"System.dll" /r:"System.Xml.dll" /r:"System.Data.dll" /r:"System.Web.dll" /r:"System.Web.Services.dll" /r:"System.Drawing.dll" -- aspx_temp.vb
+test-aspx: aspx_temp.dll
+
+aspx_temp.dll: aspx_temp.vb
+       $(BASCOMPILE) --stacktrace --verbosegetoptions /target:library /r:"System.dll" /r:"System.Xml.dll" /r:"System.Data.dll" /r:"System.Web.dll" /r:"System.Web.Services.dll" /r:"System.Drawing.dll" -- aspx_temp.vb
 
 profile: *.vb *.mbs Makefile
-       mono --profile ../../mbas.exe /libpath:../../../class/lib/default /out:x.exe /target:exe -r:System.Windows.Forms -r:System.Web /r:Mono.GetOptions /m:WriteOK *.vb *.mbs > profile
+       rm -f WriteOK.exe
+       $(MAKE) RUNTIME='$(RUNTIME) --profile' WriteOK.exe > profile
 
-clean:
-       @rm -f WriteOK.exe aspx_temp.dll x.exe
+clean-local:
+       -rm -f WriteOK.exe aspx_temp.dll x.exe
 
-all test install run-test-ondotnet uninstall:
+all-local install-local uninstall-local:
        @:
-       @:
\ No newline at end of file
+
+DISTFILES = $(wildcard *.vb) $(wildcard *.mbs)
+
+dist-local: dist-default

diff --git a/mcs/mbas/Test/test-mbas.make b/mcs/mbas/Test/test-mbas.make
index ea3f3fa4d7046a89748caa24c7ef1b5c94e3fb99..0867fc053ecda977ba05921e8a78c9f68af0ccde 100644 (file)
--- a/mcs/mbas/Test/test-mbas.make
+++ b/mcs/mbas/Test/test-mbas.make
@@ -1,8 +1,5 @@
-thisdir = tests
-SUBDIRS = 
-
 ifndef COMPILER
-COMPILER = mbas
+COMPILER = $(BASCOMPILE)
 endif
 
 ifndef PATTERN
@@ -11,20 +8,20 @@ endif
 
 COMPILER_FLAGS = /libpath:../../../class/lib/default /imports:System
 LIBRARY_OPT = /target:library
-DISTFILES = README.tests $(wildcard *.vb)
-
-run-test: 
-       @ rm -f *.exe *.log *.results; 
-       @ ../test-mbas.pl --compiler=$(COMPILER) --compilerflags=$(COMPILER_FLAGS) --pattern=$(PATTERN) --runtime=mono
-
-run-test-ondotnet: 
-       @ rm -f *.exe *.log *.results; 
-       @ ../test-mbas.pl --compiler=$(COMPILER) --compilerflags=$(COMPILER_FLAGS) --pattern=$(PATTERN) --runtime=dotnet
-
-all test clean install uninstall:
-       @:
+DISTFILES = $(wildcard README.tests) $(wildcard *.vb)
 
+run-test-local: 
+       $(MAKE) clean-local
+       ../test-mbas.pl --compiler='$(COMPILER)' --compilerflags='$(COMPILER_FLAGS)' --pattern='$(PATTERN)' --runtime='$(TEST_RUNTIME)'
 
+run-test-ondotnet-local:
+       $(MAKE) clean-local
+       ../test-mbas.pl --compiler='$(COMPILER)' --compilerflags='$(COMPILER_FLAGS)' --pattern='$(PATTERN)' --runtime=
 
+clean-local:
+       rm -f *.exe *.log *.results
 
+all-local test-local install-local uninstall-local:
+       @:
 
+dist-local: dist-default

diff --git a/mcs/mbas/Test/test-mbas.pl b/mcs/mbas/Test/test-mbas.pl
index bfe48f8bfce876803dbccc995636835837d33407..615e4a24aa4759406754337ead19aa6dcd51b863 100755 (executable)
--- a/mcs/mbas/Test/test-mbas.pl
+++ b/mcs/mbas/Test/test-mbas.pl
@@ -231,24 +231,6 @@ if(!$result || $PrintHelp) {
     exit 1;
 }
 
-
-if(!$Runtime) {
-    if($Compiler =~ /mbas/) {
-       $Runtime = "mono";
-    }
-    elsif($Compiler =~ /vbc/) {
-       $Runtime = "";
-    }
-}
-elsif($Runtime =~ /dotnet/) {
-    $Runtime = "";
-}
-elsif($Runtime =~ /mono/) {
-    $Runtime = "mono";
-}
-else {
-    $Runtime = "mono";
-}
 # Build the list of tests to run
 
 open(TEST_RESULTS_FILE, ">$TestResultsFile");
@@ -269,7 +251,7 @@ while(defined ($vbFile = glob($FilePattern))) {
            if($Execute == 1) {
                $VBExeFile = $VBFile;
                $VBExeFile =~ s/\.vb$/\.exe/;
-               $RunCmd = $Runtime . " " . $VBExeFile;
+               $RunCmd = "$Runtime ./$VBExeFile";
                $RetVal = Command($RunCmd);
                LogResults($RetVal, "EXECUTION");
            } 

diff --git a/mcs/mbas/Test/tests/Makefile b/mcs/mbas/Test/tests/Makefile
index 82cd5943bec1eadae2e8fc4fdb96816ea62ca69e..ab5a95860ab1db603cc2b76261ec600678b12fc4 100644 (file)
--- a/mcs/mbas/Test/tests/Makefile
+++ b/mcs/mbas/Test/tests/Makefile
@@ -1,9 +1,5 @@
-thisdir = dlls
-SUBDIRS = 
+thisdir = mbas/Test/tests
+include ../../../build/rules.make
 
 include ../test-mbas.make
 
-
-
-
-