Author: atsushi
Date: 2007-02-28 07:11:12 -0500 (Wed, 28 Feb 2007)
New Revision: 73534
Modified:
trunk/olive/ChangeLog
trunk/olive/Makefile
trunk/olive/build/ChangeLog
trunk/olive/build/config-default.make
trunk/olive/build/library.make
trunk/olive/build/rules.make
Log:
2007-02-28 Atsushi Enomoto <[EMAIL PROTECTED]>
* Makefile : skip net_2_0 which is not necessary.
* rules.make, config-default.make, library.make:
now we use nunit-console2 instead of nunit20 inside. Since this
breaks "run-test-ondotnet", let's expect that nunit-console.exe
exists at $(topdir)../mcs/class/lib/net_2_0, or use
"make TEST_HARNESS_ONDOTNET=your/path/to/nunit-console.exe run-test
-ondfotnet" .
Modified: trunk/olive/ChangeLog
===================================================================
--- trunk/olive/ChangeLog 2007-02-28 10:44:54 UTC (rev 73533)
+++ trunk/olive/ChangeLog 2007-02-28 12:11:12 UTC (rev 73534)
@@ -1,3 +1,7 @@
+2007-02-28 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * Makefile : skip net_2_0 which is not necessary.
+
2007-02-27 Wade Berrier <[EMAIL PROTECTED]>
* scripts/Makefile: use MKINSTALLDIR and INSTALL for
Modified: trunk/olive/Makefile
===================================================================
--- trunk/olive/Makefile 2007-02-28 10:44:54 UTC (rev 73533)
+++ trunk/olive/Makefile 2007-02-28 12:11:12 UTC (rev 73534)
@@ -1,8 +1,8 @@
thisdir := .
-SUBDIRS := build class tools nunit20 data scripts
+SUBDIRS := build class tools data scripts
-net_3_0_SUBDIRS := build class tools nunit20 data scripts
+net_3_0_SUBDIRS := build class tools data scripts
include build/rules.make
Modified: trunk/olive/build/ChangeLog
===================================================================
--- trunk/olive/build/ChangeLog 2007-02-28 10:44:54 UTC (rev 73533)
+++ trunk/olive/build/ChangeLog 2007-02-28 12:11:12 UTC (rev 73534)
@@ -1,3 +1,12 @@
+2007-02-28 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * rules.make, config-default.make, library.make:
+ now we use nunit-console2 instead of nunit20 inside. Since this
+ breaks "run-test-ondotnet", let's expect that nunit-console.exe
+ exists at $(topdir)../mcs/class/lib/net_2_0, or use
+ "make TEST_HARNESS_ONDOTNET=your/path/to/nunit-console.exe run-test
+ -ondfotnet" .
+
2007-02-27 Wade Berrier <[EMAIL PROTECTED]>
* Makefile: use 'install' instead of hardcoded path to mono's
'install-sh'
Modified: trunk/olive/build/config-default.make
===================================================================
--- trunk/olive/build/config-default.make 2007-02-28 10:44:54 UTC (rev
73533)
+++ trunk/olive/build/config-default.make 2007-02-28 12:11:12 UTC (rev
73534)
@@ -7,7 +7,7 @@
# there.
RUNTIME_FLAGS =
-TEST_HARNESS = $(topdir)/class/lib/$(PROFILE)/nunit-console.exe
+TEST_HARNESS_ONDOTNET = $(topdir)/../mcs/class/lib/net_2_0/nunit-console.exe
MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)
MBAS_FLAGS = $(PLATFORM_DEBUG_FLAGS)
LIBRARY_FLAGS = /noconfig
Modified: trunk/olive/build/library.make
===================================================================
--- trunk/olive/build/library.make 2007-02-28 10:44:54 UTC (rev 73533)
+++ trunk/olive/build/library.make 2007-02-28 12:11:12 UTC (rev 73534)
@@ -194,13 +194,13 @@
## FIXME: i18n problem in the 'sed' command below
run-test-lib: test-local
ok=:; \
- $(TEST_RUNTIME) $(TEST_HARNESS) $(TEST_HARNESS_FLAGS)
$(LOCAL_TEST_HARNESS_FLAGS) /output:TestResult-$(PROFILE).log
/exclude:NotWorking,ValueAdd,CAS,InetAccess /xml:TestResult-$(PROFILE).xml
$(test_assemblies) || ok=false; \
+ nunit-console2 $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS)
/output:TestResult-$(PROFILE).log /exclude:NotWorking,ValueAdd,CAS,InetAccess
/xml:TestResult-$(PROFILE).xml $(test_assemblies) || ok=false; \
sed '1,/^Tests run: /d' TestResult-$(PROFILE).log; \
$$ok
run-test-ondotnet-lib: test-local
ok=:; \
- $(TEST_HARNESS) $(TEST_HARNESS_FLAGS)
$(LOCAL_TEST_HARNESS_ONDOTNET_FLAGS) /exclude=NotDotNet,CAS
/output:TestResult-ondotnet-$(PROFILE).log
/xml:TestResult-ondotnet-$(PROFILE).xml $(test_assemblies) || ok=false; \
+ $(TEST_HARNESS_ONDOTNET) $(TEST_HARNESS_FLAGS)
$(LOCAL_TEST_HARNESS_ONDOTNET_FLAGS) /exclude=NotDotNet,CAS
/output:TestResult-ondotnet-$(PROFILE).log
/xml:TestResult-ondotnet-$(PROFILE).xml $(test_assemblies) || ok=false; \
sed '1,/^Tests run: /d' TestResult-ondotnet-$(PROFILE).log; \
$$ok
endif
Modified: trunk/olive/build/rules.make
===================================================================
--- trunk/olive/build/rules.make 2007-02-28 10:44:54 UTC (rev 73533)
+++ trunk/olive/build/rules.make 2007-02-28 12:11:12 UTC (rev 73534)
@@ -46,7 +46,7 @@
export CFLAGS
export INSTALL
export MKINSTALLDIRS
-export TEST_HARNESS
+export TEST_HARNESS_ONDOTNET
export BOOTSTRAP_MCS
export DESTDIR
export RESGEN
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
