Fix some existing datetime tests

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

diff --git a/mcs/class/corlib/Makefile b/mcs/class/corlib/Makefile
index 9869d84b04050516e44863630dad22713dfa4b67..630bb164aaa22160b4ff18a4c89585f82dff9eb8 100644 (file)
--- a/mcs/class/corlib/Makefile
+++ b/mcs/class/corlib/Makefile
@@ -43,7 +43,6 @@ DEFAULT_REFERENCES =
 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          \
@@ -90,8 +89,7 @@ $(cmp_makefrag): $(cmp_response)
 $(cmp_response) $(cmp_makefrag): Makefile $(depsdir)/.stamp
 endif
 
-vts = VersionTolerantSerialization
-vtsdir = Test/System.Runtime.Serialization.Formatters.Binary/$(vts)
+vtsdir = Test/System.Runtime.Serialization.Formatters.Binary/VersionTolerantSerialization
 vtslibs = \
        $(vtsdir)/$(PROFILE)_TestLib/1.0/Address.dll \
        $(vtsdir)/$(PROFILE)_TestLib/2.0/Address.dll \
@@ -115,16 +113,16 @@ $(vtsdir)/$(PROFILE)_TestLib/BinarySerializationOverVersions.exe: $(vtsdir)/Bina
 # Need to define MONO_PATH to an absolute dir since the test is ran from a subdir
 run-test-vts: test-vts
        @echo Running vts tests...
-       $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(TEST_HARNESS) -noshadow \
+       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)/TestLib/1.0/Address.cs \
-       $(vtsdir)/TestLib/2.0/Address.cs \
-       $(vtsdir)/TestLib/3.0/Address.cs \
-       $(vtsdir)/TestLib/4.0/Address.cs \
-       $(vtsdir)/TestLib/5.0/Address.cs \
-       $(vtsdir)/TestLib/6.0/Address.cs \
+       $(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