Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build a checked mono #6304

Closed
wants to merge 5 commits into from
Closed

Build a checked mono #6304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a85334f
Bump mono to use a checked build to track down mono/mono#15125.
rolfbjarne Jun 14, 2019
de7d7b9
Don't run tests since this branch is for tracking down a mono bug dur…
rolfbjarne Jun 14, 2019
999d799
More test butchering.
rolfbjarne Jun 17, 2019
48b3cd3
Merge remote-tracking branch 'origin/xcode11' into xcode11-mono-check…
rolfbjarne Jun 17, 2019
92aaa9a
[xcode11-mono-checked-build] Don't abort existing builds, it's on pur…
rolfbjarne Jun 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
[submodule "external/mono"]
path = external/mono
url = ../../mono/mono.git
branch = 2019-02
branch = 2019-02-xcode11-checked-build
[submodule "external/opentk"]
path = external/opentk
url = ../../mono/opentk.git
Expand Down
2 changes: 1 addition & 1 deletion external/mono
Open in desktop
Submodule mono updated 35 files
+4 −30 configure.ac
+1 −1 external/api-snapshot
+1 −1 external/corefx
+1 −1 external/roslyn-binaries
+2 −2 mcs/build/library.make
+1 −1 mcs/build/profiles/build.make
+0 −2 mcs/build/profiles/monotouch_watch.make
+1 −1 mcs/build/profiles/xammac.make
+0 −2 mcs/build/profiles/xammac_net_4_5.make
+7 −9 mcs/build/rules.make
+1 −2 mcs/build/start-compiler-server.sh
+2 −2 mcs/build/tests.make
+3 −13 mcs/class/System.Core/System.Security.Cryptography.X509Certificates/RSACertificateExtensions.cs
+2 −2 mcs/class/System/System.Net/HttpListener.Mono.cs
+0 −12 mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2Impl.cs
+0 −1 mcs/class/corlib/ReferenceSources/MethodBase.cs
+0 −4 mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509CertificateImpl.cs
+0 −36 mcs/class/corlib/Test/System/AppDomainTest.cs
+0 −1 mcs/class/corlib/corefx/MethodInfo.cs
+7 −4 mcs/packages/Makefile
+2 −2 mcs/tools/security/Makefile
+1 −2 mcs/tools/security/httpcfg.cs
+0 −5 mono/metadata/assembly.c
+12 −12 mono/metadata/external-only.c
+0 −21 mono/metadata/remoting.c
+1 −1 mono/mini/Makefile.am.in
+0 −7 mono/mini/objects.cs
+0 −4 mono/mini/ssa.c
+0 −10 mono/utils/mono-md5.c
+10 −12 mono/utils/mono-threads-mach-helper.c
+1 −1 packaging/MacSDK/msbuild.py
+1 −1 packaging/MacSDK/nuget.py
+6 −0 scripts/Makefile.am
+2 −0 sdks/builds/ios.mk
+1 −0 sdks/builds/mac.mk
610 changes: 305 additions & 305 deletions jenkins/Jenkinsfile
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions jenkins/build-api-diff.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/bash -e

exit 0

cd "$(dirname "${BASH_SOURCE[0]}")/.."
WORKSPACE=$(pwd)

Expand Down
2 changes: 2 additions & 0 deletions jenkins/compare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/bash -e

exit 0

#
# How to run API comparison locally:
#
Expand Down
3 changes: 3 additions & 0 deletions jenkins/run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash -e

# Testing mono build here, not running our tests.
exit 0

cd "$(dirname "${BASH_SOURCE[0]}")/.."
WORKSPACE=$(pwd)

Expand Down
10 changes: 3 additions & 7 deletions tests/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,17 +359,13 @@ wrench-%:
@echo Not here anymore

wrench-jenkins: xharness/xharness.exe
$(Q) rm -f $@-failed.stamp
$(Q) ulimit -n 4096 && $(SYSTEM_MONO) --trace=E:all --debug $(CURDIR)/$< $(XHARNESS_VERBOSITY) --jenkins --autoconf --rootdir $(CURDIR) --sdkroot $(XCODE_DEVELOPER_ROOT) --label run-all-tests,skip-device-tests --markdown-summary=$(abspath $(CURDIR))/TestSummary.md $(TESTS_PERIODIC_COMMAND) || echo "$$?" > $@-failed.stamp
@echo "@MonkeyWrench: SetSummary: <br/>`cat $(abspath $(CURDIR))/TestSummary.md | awk 1 ORS='<br/>'`"
@echo "@MonkeyWrench: AddFile: $(abspath $(CURDIR))/TestSummary.md"
$(Q) if test -e $@-failed.stamp; then EC=`cat $@-failed.stamp`; rm -f $@-failed.stamp; exit $$EC; fi
true

wrench-xtro:
@echo Not here anymore

jenkins: xharness/xharness.exe
$(Q) $(SYSTEM_MONO) --trace=E:all --debug $(CURDIR)/$< $(XHARNESS_VERBOSITY) --jenkins --autoconf --rootdir $(CURDIR) --sdkroot $(XCODE_DEVELOPER_ROOT) --markdown-summary=$(abspath $(CURDIR))/TestSummary.md
true

# This will launch xharness' interactive test runner in the system's default browser
runner: xharness/xharness.exe
Expand All @@ -379,7 +375,7 @@ runner: xharness/xharness.exe
# This makefile target will run the device tests using the Xamarin.iOS version
# installed on the system.
vsts-device-tests: xharness/xharness.exe
$(Q) ulimit -n 4096 && $(SYSTEM_MONO) --debug $(CURDIR)/$< $(XHARNESS_VERBOSITY) --jenkins --autoconf --rootdir $(CURDIR) --sdkroot $(XCODE_DEVELOPER_ROOT) --use-system:true --label=skip-all-tests,run-device-tests,run-bcl-tests --markdown-summary=$(CURDIR)/TestSummary.md $(TESTS_EXTRA_ARGUMENTS) $(TESTS_PERIODIC_COMMAND)
true

ifdef ENABLE_XAMARIN
wrench-launch-external wrench-report-external:
Expand Down