Fix some existing datetime tests

[mono.git] / mcs / class / corlib / Makefile

diff --git a/mcs/class/corlib/Makefile b/mcs/class/corlib/Makefile
index 6d4ea0bf1d0f08381125eb2048cdcde465e23254..630bb164aaa22160b4ff18a4c89585f82dff9eb8 100644 (file)
--- a/mcs/class/corlib/Makefile
+++ b/mcs/class/corlib/Makefile
@@ -8,8 +8,20 @@ LIBRARY_NAME = mscorlib.dll
 LIB_MCS_FLAGS = $(RESOURCE_FILES:%=-resource:%)
 LIBRARY_USE_INTERMEDIATE_FILE = yes
 
-ifeq (4.0, $(FRAMEWORK_VERSION))
+ifeq (basic, $(PROFILE))
+
+else
+
+ifeq (2, $(FRAMEWORK_VERSION_MAJOR))
+LIB_MCS_FLAGS += --runtime:v2
+else
+ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
 LIB_MCS_FLAGS += --runtime:v4
+else
+$(error Unknown framework version)
+endif
+endif
+
 endif
 
 LIBRARY_COMPILE = $(BOOT_COMPILE)
@@ -28,10 +40,9 @@ LOCAL_MCS_FLAGS = -unsafe -nostdlib -nowarn:612,618 -d:INSIDE_CORLIB -d:LIBC
 DEFAULT_REFERENCES =
 
 # System.IO/DirectoryInfoTest.cs needs Mono.Posix
-TEST_MCS_FLAGS = -debug+ -debug:full -nowarn:168,219,618,672 -unsafe -r:$(topdir)/class/lib/$(PROFILE)/Mono.Posix.dll -define:MONO_DATACONVERTER_STATIC_METHODS
+TEST_MCS_FLAGS = -debug+ -debug:full -nowarn:168,219,618,672 -unsafe -r:Mono.Posix.dll -r:System.Core.dll -define:MONO_DATACONVERTER_STATIC_METHODS
 
 EXTRA_DISTFILES = \
-       Test/ms_run_test.sh                     \
        Test/resources/MyResources.resources    \
        Test/resources/MyResources.de.resources \
        Test/resources/Empty.resources          \
@@ -78,35 +89,40 @@ $(cmp_makefrag): $(cmp_response)
 $(cmp_response) $(cmp_makefrag): Makefile $(depsdir)/.stamp
 endif
 
-vts = VersionTolerantSerialization
-vtsdir = Test/System.Runtime.Serialization.Formatters.Binary/$(vts)
-test-vts:
-       $(MCS) -target:library \
-               $(vtsdir)/$(vts)TestLib/1.0/Address.cs
-       $(MCS) $(test_nunit_ref) \
-               -r:$(vtsdir)/$(vts)TestLib/1.0/Address.dll \
-               $(vtsdir)/BinarySerializationOverVersions.cs
-       cp $(vtsdir)/$(vts)TestLib/1.0/Address.dll $(vtsdir)
-       $(MCS) -target:library \
-               $(vtsdir)/$(vts)TestLib/2.0/Address.cs
-       $(MCS) -target:library \
-               $(vtsdir)/$(vts)TestLib/3.0/Address.cs
-       $(MCS) -target:library \
-               $(vtsdir)/$(vts)TestLib/4.0/Address.cs
-       $(MCS) -target:library \
-               $(vtsdir)/$(vts)TestLib/5.0/Address.cs
-       $(MCS) -target:library \
-               $(vtsdir)/$(vts)TestLib/6.0/Address.cs
+vtsdir = Test/System.Runtime.Serialization.Formatters.Binary/VersionTolerantSerialization
+vtslibs = \
+       $(vtsdir)/$(PROFILE)_TestLib/1.0/Address.dll \
+       $(vtsdir)/$(PROFILE)_TestLib/2.0/Address.dll \
+       $(vtsdir)/$(PROFILE)_TestLib/3.0/Address.dll \
+       $(vtsdir)/$(PROFILE)_TestLib/4.0/Address.dll \
+       $(vtsdir)/$(PROFILE)_TestLib/5.0/Address.dll \
+       $(vtsdir)/$(PROFILE)_TestLib/6.0/Address.dll
+
+test-vts: $(vtslibs) $(vtsdir)/$(PROFILE)_TestLib/BinarySerializationOverVersions.exe
+
+$(vtsdir)/$(PROFILE)_TestLib/%/Address.dll: $(vtsdir)/VersionTolerantSerializationTestLib/%/Address.cs
+       @mkdir -p $(dir $@)
+       $(CSCOMPILE) -target:library -r:$(corlib) -warn:0 -out:$@ $^
+
+$(vtsdir)/$(PROFILE)_TestLib/BinarySerializationOverVersions.exe: $(vtsdir)/BinarySerializationOverVersions.cs $(vtsdir)/$(PROFILE)_TestLib/1.0/Address.dll
+       $(CSCOMPILE) $(test_nunit_ref) -warn:0 -r:$(corlib) \
+               -r:$(vtsdir)/$(PROFILE)_TestLib/1.0/Address.dll \
+               $(vtsdir)/BinarySerializationOverVersions.cs -out:$@
+       @cp $(vtsdir)/$(PROFILE)_TestLib/1.0/Address.dll $(vtsdir)/$(PROFILE)_TestLib
+
+# Need to define MONO_PATH to an absolute dir since the test is ran from a subdir
 run-test-vts: test-vts
-       $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(TEST_HARNESS) -noshadow \
-               $(vtsdir)/BinarySerializationOverVersions.exe 
+       @echo Running vts tests...
+       PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(TEST_HARNESS) -noshadow \
+               $(vtsdir)/$(PROFILE)_TestLib/BinarySerializationOverVersions.exe
 test: test-vts
 run-test: run-test-vts
 
 EXTRA_DISTFILES += \
-       $(vtsdir)/$(vts)TestLib/1.0/Address.cs \
-       $(vtsdir)/$(vts)TestLib/2.0/Address.cs \
-       $(vtsdir)/$(vts)TestLib/3.0/Address.cs \
-       $(vtsdir)/$(vts)TestLib/4.0/Address.cs \
-       $(vtsdir)/$(vts)TestLib/5.0/Address.cs \
-       $(vtsdir)/BinarySerializationOverVersions.cs
\ No newline at end of file
+       $(vtsdir)/VersionTolerantSerializationTestLib/1.0/Address.cs \
+       $(vtsdir)/VersionTolerantSerializationTestLib/2.0/Address.cs \
+       $(vtsdir)/VersionTolerantSerializationTestLib/3.0/Address.cs \
+       $(vtsdir)/VersionTolerantSerializationTestLib/4.0/Address.cs \
+       $(vtsdir)/VersionTolerantSerializationTestLib/5.0/Address.cs \
+       $(vtsdir)/VersionTolerantSerializationTestLib/6.0/Address.cs \
+       $(vtsdir)/BinarySerializationOverVersions.cs