diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2015-11-03 18:00:14 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2015-11-03 18:00:42 +0300 |
| commit | f2c46dbf7aed78c4493a710582f447c216edf8d2 (patch) | |
| tree | 5ad9e8e513f7616b036462670c6fa2c92a20e570 /acceptance-tests | |
| parent | 1a1711625de9bbadf441fcfe06fdbe9ff356d3a6 (diff) | |
[acceptance-tests] Bump coreclr to pick up c1f0812bd0f94f085eb29199ef3b5bd69eab24bb:
Diffstat (limited to 'acceptance-tests')
| -rw-r--r-- | acceptance-tests/Makefile.am | 4 | ||||
| -rw-r--r-- | acceptance-tests/SUBMODULES.json | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/acceptance-tests/Makefile.am b/acceptance-tests/Makefile.am index 67edf6928a3..597b13bcef7 100644 --- a/acceptance-tests/Makefile.am +++ b/acceptance-tests/Makefile.am @@ -1698,7 +1698,6 @@ CORECLR_COREMANGLIB_TEST_CS_SRC= \ $(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/reflection/constructorinfo/constructorinfoconstructorname.cs \ $(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/reflection/assemblydefaultaliasattribute/assemblydefaultaliasattributector.cs \ $(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/reflection/assemblydefaultaliasattribute/assemblydefaultaliasattributedefaultalias.cs \ - $(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/reflection/assembly/testtarget.cs \ $(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/reflection/assemblydelaysignattribute/assemblydelaysignattributector.cs \ $(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/reflection/assemblydelaysignattribute/assemblydelaysignattributedelaysign.cs \ $(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/fieldattributesinitonly.cs \ @@ -4029,6 +4028,7 @@ CORECLR_DISABLED_TEST_CS_SRC += \ $(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshal/oleaut32.cs \ $(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/delegate/testforotherassembly.cs \ $(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/reflection/assembly/testassembly1.cs \ + $(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/reflection/assembly/testtarget.cs \ $(CORECLR_PATH)/tests/src/CoreMangLib/reflection/assembly/testassembly.cs \ $(CORECLR_PATH)/tests/src/CoreMangLib/system/exception/data_helper.cs \ $(CORECLR_PATH)/tests/src/CoreMangLib/system/reflection/assembly/server4.cs \ @@ -5195,7 +5195,7 @@ coreclr-testlibrary.dll: $(CORECLR_TESTLIBRARY_CS_SRC) $(MCS) -unsafe -debug -target:library -d:WINCORESYS -out:$@ $(CORECLR_TESTLIBRARY_CS_SRC) $(CORECLR_PATH)%.exe: $(CORECLR_PATH)%.cs coreclr-testlibrary.dll - $(MCS) -unsafe -debug -nowarn:0162 -nowarn:0168 -nowarn:0219 -nowarn:0414 -nowarn:0618 -nowarn:0169 -nowarn:1690 -nowarn:0649 -nowarn:0612 -nowarn:3021 -nowarn:0197 -r:coreclr-testlibrary.dll -out:$@ $< + $(MCS) -unsafe -debug -nowarn:0162 -nowarn:0168 -nowarn:0219 -nowarn:0414 -nowarn:0618 -nowarn:0169 -nowarn:1690 -nowarn:0649 -nowarn:0612 -nowarn:3021 -nowarn:0197 -r:coreclr-testlibrary.dll -d:MONO -out:$@ $< test-runner.exe: $(top_srcdir)/mono/tests/test-runner.cs $(MCS) -debug -out:$@ $< diff --git a/acceptance-tests/SUBMODULES.json b/acceptance-tests/SUBMODULES.json index dd9f284dc6f..c26a84454da 100644 --- a/acceptance-tests/SUBMODULES.json +++ b/acceptance-tests/SUBMODULES.json @@ -10,7 +10,7 @@ { "name": "coreclr", "url": "git://github.com/mono/coreclr.git", - "rev": "d17e1e45e9b9e14a56ebecec21155257ab9f73f7", + "rev": "c1f0812bd0f94f085eb29199ef3b5bd69eab24bb", "remote-branch": "origin/mono", "branch": "mono", "directory": "coreclr" |