[corlib] The hashcode of an empty struct must be constant. Fixes #17577

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

diff --git a/mcs/class/corlib/Makefile b/mcs/class/corlib/Makefile
index 38a2891901fb033282ac54b5b07f82bf8b350599..3000f81971b1ccdc94ecbda7dee4befe574c257f 100644 (file)
--- a/mcs/class/corlib/Makefile
+++ b/mcs/class/corlib/Makefile
@@ -40,7 +40,8 @@ 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:Mono.Posix.dll -r:System.Core.dll -define:MONO_DATACONVERTER_STATIC_METHODS
+TEST_MCS_FLAGS = -debug -nowarn:168,219,618,672 -unsafe -r:Mono.Posix.dll -r:System.Core.dll \
+                                -define:MONO_DATACONVERTER_STATIC_METHODS $(TEST_RESX_RESOURCES:%=-resource:%)
 
 EXTRA_DISTFILES = \
        Test/resources/MyResources.resources    \
@@ -52,7 +53,18 @@ EXTRA_DISTFILES = \
        Test/resources/bug81759.resources       \
        Test/resources/415628.bin               \
        Test/resources/Fergie.GED               \
-       $(RESOURCE_FILES)
+       Test/resources/culture-*.cs             \
+       $(RESOURCE_FILES) \
+       $(TEST_RESOURCES:.resources=.resx)
+
+TEST_RESX_RESOURCES = \
+       Test/resources/Resources.resources
+
+TEST_RESX_RESOURCES_SATELITE = \
+       Test/resources/Resources.es-ES.resources \
+       Test/resources/Resources.nn-NO.resources \
+
+CLEAN_FILES += $(TEST_RESX_RESOURCES)
 
 include $(topdir)/build/library.make
 
@@ -89,6 +101,24 @@ $(cmp_makefrag): $(cmp_response)
 $(cmp_response) $(cmp_makefrag): Makefile $(depsdir)/.stamp
 endif
 
+$(TEST_RESX_RESOURCES) $(TEST_RESX_RESOURCES_SATELITE): %.resources: %.resx
+       $(RESGEN) $< || cp $@.prebuilt $@
+
+TEST_RESOURCES = $(TEST_RESX_RESOURCES) $(TEST_RESX_RESOURCES_SATELITE)
+
+satellite_assembly1 = es-ES/$(patsubst %.dll,%.resources.dll,$(test_lib))
+satellite_assembly2 = nn-NO/$(patsubst %.dll,%.resources.dll,$(test_lib))
+
+$(test_lib): $(TEST_RESOURCES) $(satellite_assembly1) $(satellite_assembly2) 
+
+$(satellite_assembly1): Test/resources/culture-es-ES.cs Test/resources/Resources.es-ES.resources
+       @mkdir -p es-ES
+       $(CSCOMPILE) -target:library -r:$(corlib) Test/resources/culture-es-ES.cs -resource:Test/resources/Resources.es-ES.resources -out:$@
+
+$(satellite_assembly2): Test/resources/culture-nn-NO.cs Test/resources/Resources.nn-NO.resources
+       @mkdir -p nn-NO
+       $(CSCOMPILE) -target:library -r:$(corlib) Test/resources/culture-nn-NO.cs -resource:Test/resources/Resources.nn-NO.resources -out:$@
+
 vtsdir = Test/System.Runtime.Serialization.Formatters.Binary/VersionTolerantSerialization
 vtslibs = \
        $(vtsdir)/$(PROFILE)_TestLib/1.0/Address.dll \
@@ -110,10 +140,12 @@ $(vtsdir)/$(PROFILE)_TestLib/BinarySerializationOverVersions.exe: $(vtsdir)/Bina
                $(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
+# Need to define TEST_MONO_PATH to an absolute dir since the test is ran from a subdir
+TEST_MONO_PATH=$(PWD)/../lib/$(PROFILE)
+
 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