summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Volodymyr Medvid <vmedvid@riseup.net> 2015-09-04 08:55:54 +0000
committerAvatar Wulf C. Krueger <philantrop@exherbo.org> 2015-10-23 18:07:29 +0200
commitb21e55b8c4011dc84644d1243b4fe020a8d23d3b (patch)
tree8ef5426d75286c01eb94629b219f470966b5b9a3
parent4aa1a9a55f3d15da7520e9e5f68a9a0d7687f1db (diff)
downloadmono-b21e55b8c4011dc84644d1243b4fe020a8d23d3b.tar.gz
mono-b21e55b8c4011dc84644d1243b4fe020a8d23d3b.tar.xz
mono: bump to 4.2.1.36 (masked)
Change-Id: Icb25ed31a291a71b77b1d4741be9153e20ca156c Reviewed-on: https://galileo.mailstation.de/gerrit/3513 Reviewed-by: Jenkins <philantrop@gmail.com> Reviewed-by: Xavier Barrachina <xv.barrachina@gmail.com> Reviewed-by: Wulf C. Krueger <philantrop@exherbo.org>
-rw-r--r--packages/dev-lang/mono/files/remove-test-that-requires-non-existent-test-runner.patch18
-rw-r--r--packages/dev-lang/mono/mono-4.2.1.36.exheres-0 (renamed from packages/dev-lang/mono/mono-4.0.2.5.exheres-0)4
-rw-r--r--packages/dev-lang/mono/mono-lang.exlib10
3 files changed, 9 insertions, 23 deletions
diff --git a/packages/dev-lang/mono/files/remove-test-that-requires-non-existent-test-runner.patch b/packages/dev-lang/mono/files/remove-test-that-requires-non-existent-test-runner.patch
deleted file mode 100644
index d99008a..0000000
--- a/packages/dev-lang/mono/files/remove-test-that-requires-non-existent-test-runner.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Source: written by Anders Ladegaard Marchsteiner <alm.anma@gmail.com>
-Upstream: no
-Reason: the test-runner isn't included
-
-diff -urpN a/mono/tests/Makefile.am b/mono/tests/Makefile.am
---- a/mono/tests/Makefile.am 2015-07-08 10:59:55.141601882 +0200
-+++ b/mono/tests/Makefile.am 2015-07-08 11:00:36.266985401 +0200
-@@ -837,9 +837,7 @@ runtest: $(TESTSI_CS) $(TESTSI_IL) $(TES
- exit 1; \
- fi
-
--runtest-managed: test-runner.exe $(TESTSI_CS) $(TESTSI_IL) $(TESTBS) libtest.la $(PREREQSI_IL) $(PREREQSI_CS)
-- @if [ "x$$CI" = "x1" ]; then disabled_tests="$(DISABLED_TESTS_WRENCH)"; else disabled_tests="$(DISABLED_TESTS)"; fi; \
-- $(RUNTIME) ./test-runner.exe -j a --disabled "$${disabled_tests}" $(TESTSI_CS) $(TESTBS) $(TESTSI_IL)
-+runtest-managed:
-
- testjit:
- @if test x$(M) != x0; then $(MAKE) runtest-managed; else $(MAKE) runtest; fi
diff --git a/packages/dev-lang/mono/mono-4.0.2.5.exheres-0 b/packages/dev-lang/mono/mono-4.2.1.36.exheres-0
index 37caa07..06cc520 100644
--- a/packages/dev-lang/mono/mono-4.0.2.5.exheres-0
+++ b/packages/dev-lang/mono/mono-4.2.1.36.exheres-0
@@ -1,11 +1,9 @@
# Copyright 2008 Saleem Abdulrasool <compnerd@compnerd.org>
# Distributed under the temrs of the GNU General Public License v2
-require mono-lang
+require mono-lang
PLATFORMS="~amd64 ~x86"
-DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}/remove-test-that-requires-non-existent-test-runner.patch" )
-
WORK="${WORKBASE}/${PN}-$(ever range 1-3)"
diff --git a/packages/dev-lang/mono/mono-lang.exlib b/packages/dev-lang/mono/mono-lang.exlib
index c7b0e88..c8908dc 100644
--- a/packages/dev-lang/mono/mono-lang.exlib
+++ b/packages/dev-lang/mono/mono-lang.exlib
@@ -38,6 +38,11 @@ mono-lang_src_prepare() {
-e 's/^\tcpp/\t$(CPP)/' \
-i mono/mini/Makefile.am.in
+ # mono-4: delete invalid target from the tests Makefile
+ edo sed \
+ -e "/^check-local/s/test-unhandled-exception-2//" \
+ -i mono/tests/Makefile.am
+
autotools_src_prepare
}
@@ -67,9 +72,10 @@ mono-lang_src_configure() {
mono-lang_src_test() {
edo pushd mono/tests
- # Disable three failing tests (last checked: 3.12.0)
+ # Disable failing tests (last checked: 3.12.0)
+ # 4.2.1.36: delegate2.exe passes, but async-exc-compilcation.exe fails
EXTRA_DISABLED_TESTS="appdomain-unload-doesnot-raise-pending-events.exe \
- delegate2.exe threadpool-exceptions5.exe" emake check
+ delegate2.exe threadpool-exceptions5.exe async-exc-compilation.exe" emake check
edo popd
edo pushd mcs/tests