X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fmbas%2FMakefile;h=23518d1712887f988296f7a5a3d442ac741738ba;hb=32878af2c010544168938e2503a19dda913df570;hp=d265ef80c1483f4569cbcb89507fdba181b6685d;hpb=0a09faca2e4c3d910ebd40d205b9308a33b5f474;p=mono.git

diff --git a/mcs/mbas/Makefile b/mcs/mbas/Makefile
index d265ef80c14..23518d17128 100644
--- a/mcs/mbas/Makefile
+++ b/mcs/mbas/Makefile
@@ -1,32 +1,23 @@
 thisdir = mbas
-SUBDIRS = 
+SUBDIRS = Test
 include ../build/rules.make
 
 PROGRAM = mbas.exe
 BUILT_SOURCES = mb-parser.cs
 
-LOCAL_MCS_FLAGS = /r:System.dll /r:$(topdir)/class/lib/$(PROFILE)/Mono.GetOptions.dll
+LOCAL_MCS_FLAGS = /r:System.dll /r:$(topdir)/class/lib/$(PROFILE)/Mono.GetOptions.dll /r:$(topdir)/class/lib/$(PROFILE)/Microsoft.VisualBasic.dll
 
 EXTRA_DISTFILES = mb-parser.jay mbas.csproj mbas.ico mbas.sln
-CLEAN_FILES = y.output testmbas/WriteOK.exe
+CLEAN_FILES = y.output 
 
-PROGRAM_INSTALL_DIR = $(prefix)/lib/mono/1.0
+CONSOLIDATED_TEST_RESULTS_FILE = TestResults.log
 
 include ../build/executable.make
 
-run-test-local: run-mbas-test
-
-run-mbas-test: testmbas/WriteOK.exe
-	$(TEST_RUNTIME) --debug testmbas/WriteOK.exe
-
-mb-parser.cs: mb-parser.jay
+mb-parser.cs: mb-parser.jay $(topdir)/jay/skeleton.cs
 	$(topdir)/jay/jay -ctv <$(topdir)/jay/skeleton.cs $< >$@
 
-verbose: mbas.exe
-	$(TEST_RUNTIME) ./mbas.exe --verbosegetoptions --verbose --stacktrace /libpath:../class/lib/$(PROFILE) /r:Mono.GetOptions /r:System.Data,System.Windows.Forms --main WriteOK testmbas/WriteOK.vb testmbas/WriteOK2.mbs
-
-testmbas/WriteOK.exe: Makefile mbas.exe testmbas/*.vb testmbas/*.mbs
-	$(TEST_RUNTIME) ./mbas.exe --verbosegetoptions --stacktrace /libpath:../class/lib/$(PROFILE) --reference=Mono.GetOptions -r:System.Data,System.Messaging --main WriteOK testmbas/WriteOK.vb testmbas/WriteOK2.mbs
+consolidate-test-results:
+	@cp Test/tests/TestResults.log $(CONSOLIDATED_TEST_RESULTS_FILE)
+	@cat Test/errors/TestResults.log >> $(CONSOLIDATED_TEST_RESULTS_FILE)
 
-test-aspx: mbas.exe testmbas/aspx_temp.vb
-	$(TEST_RUNTIME) --debug ./mbas.exe --stacktrace --verbosegetoptions /libpath:../class/lib/$(PROFILE) /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" -- testmbas/aspx_temp.vb