Author: rolf
Date: 2007-05-30 14:37:06 -0400 (Wed, 30 May 2007)
New Revision: 78250
Modified:
trunk/mono-basic/vbruntime/Test/ChangeLog
trunk/mono-basic/vbruntime/Test/Make.cmd
trunk/mono-basic/vbruntime/Test/Makefile
Log:
* Make.cmd: Exclude NotWorking tests and set correct defines according
to fx version.
* Makefile: Updated, copy mdb files to output directory with assembly,
and exclude NotWorking tests.
Modified: trunk/mono-basic/vbruntime/Test/ChangeLog
===================================================================
--- trunk/mono-basic/vbruntime/Test/ChangeLog 2007-05-30 18:35:49 UTC (rev
78249)
+++ trunk/mono-basic/vbruntime/Test/ChangeLog 2007-05-30 18:37:06 UTC (rev
78250)
@@ -1,3 +1,10 @@
+2007-05-30 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
+
+ * Make.cmd: Exclude NotWorking tests and set correct defines according
+ to fx version.
+ * Makefile: Updated, copy mdb files to output directory with assembly,
+ and exclude NotWorking tests.
+
2007-05-28 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
* Makefile: Execute Make.cmd (1_1/2_0) on cygwin to check the tests
Modified: trunk/mono-basic/vbruntime/Test/Make.cmd
===================================================================
--- trunk/mono-basic/vbruntime/Test/Make.cmd 2007-05-30 18:35:49 UTC (rev
78249)
+++ trunk/mono-basic/vbruntime/Test/Make.cmd 2007-05-30 18:37:06 UTC (rev
78250)
@@ -40,11 +40,24 @@
:EXECUTETEST
pushd .
copy Microsoft.VisualBasic.dll bin
-IF "%FXVERSION%"=="2" (
+
+IF "%FXVERSION%"=="2" (GOTO SETDEFINES2_0)
+IF "%FXVERSION%"=="2_0" (GOTO SETDEFINES2_0)
+IF "%FXVERSION%"=="1_1" (GOTO SETDEFINES1_1)
+IF "%FXVERSION%"=="1" (GOTO SETDEFINES1_1)
+IF "%FXVERSION%"=="1_0" (GOTO SETDEFINES1_0)
+GOTO ENDSETDEFINES
+:SETDEFINES2_0
SET CSDEFINES=-define:NET_1_0,NET_1_1,NET_2_0
-) ELSE (
+ GOTO ENDSETDEFINES
+:SETDEFINES1_1
SET CSDEFINES=-define:NET_1_0,NET_1_1 -debug-
-)
+ GOTO ENDSETDEFINES
+:SETDEFINES1_0
+ SET CSDEFINES=-define:NET_1_0 -debug-
+ GOTO ENDSETDEFINES
+:ENDSETDEFINES
+
%CSC% "-out:bin\2005VB_test_CS.dll" @2005VB_test_CS.dll.rsp
@2005VB_test_CS.dll.sources.win -lib:bin %CSDEFINES%
IF ERRORLEVEL 1 (GOTO ENDOFFILE)
@@ -61,7 +74,7 @@
GOTO ENDSETNUNITV
:ENDSETNUNITV
-nunit-console.exe 2005VB_test_CS.dll /labels /noshadow /exclude:Slow,NotDotNet
+nunit-console.exe 2005VB_test_CS.dll /labels /noshadow
/exclude:Slow,NotDotNet,NotWorking
ECHO %ERRORLEVEL%
IF NOT "%ERRORLEVEL%"=="0" GOTO ENDOFFILE
rem del Microsoft.VisualBasic.dll
Modified: trunk/mono-basic/vbruntime/Test/Makefile
===================================================================
--- trunk/mono-basic/vbruntime/Test/Makefile 2007-05-30 18:35:49 UTC (rev
78249)
+++ trunk/mono-basic/vbruntime/Test/Makefile 2007-05-30 18:37:06 UTC (rev
78250)
@@ -53,7 +53,7 @@
MONO_PATH=$(MONO_VB_PATH) mono
../../tools/extract-source/extract-source.exe -s:2005VB_test_CS.csproj
-d:2005VB_test_CS.dll.sources.win -m:w
test-first:
- cd ../Microsoft.VisualBasic && make && cp
../../class/lib/vbnc/Microsoft.VisualBasic.dll ../Test/bin
+ cd ../Microsoft.VisualBasic && make && cp
../../class/lib/vbnc/Microsoft.VisualBasic.dll* ../Test/bin
test-cs: test-first 2005VB_test_CS.dll.sources
$(CSCOMPILER) "-out:bin/2005VB_test_CS.dll" @2005VB_test_CS.dll.rsp
@2005VB_test_CS.dll.sources -lib:bin $(CSDEFINES)
@@ -69,10 +69,10 @@
-rm -fR bin/data
run-test-cs: test-cs
- cd bin && mono --debug nunit-console.exe 2005VB_test_CS.dll /labels
+ mono --debug bin/nunit-console.exe bin/2005VB_test_CS.dll
/exclude:NotWorking /labels
run-test-vb: test-vb
- cd bin && mono --debug nunit-console.exe 2005VB_test_VB.dll /labels
+ cd bin && mono --debug nunit-console.exe 2005VB_test_VB.dll /labels
/exclude:NotWorking
run-test-local: run-test-cs run-test-vb
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
