Skip to content

Conversation

@lewurm
Copy link
Contributor

@lewurm lewurm commented Oct 18, 2017

either this PR or #2906

vargaz and others added 30 commits August 6, 2017 22:54
This is also needed to build with Xcode 8.3 on High Sierra.
- This reverts commit 76b759e.
- 2017-08 has linker fix
…ble-test

Merge master into 2017-08 and re-enable link-keep-resources-2
…ofiler-log, its called mono_profiler_init_log () now.

see
mono/mono@ea4e4a9

fixes:

```
1) Failed : Xamarin.MTouch.Profiling(tvOS)
  _mono_profiler_startup_log
  Expected: collection containing "_mono_profiler_startup_log"
  But was:  < "_mono_profiler_init_log" >
at Xamarin.MTouch.Profiling (Xamarin.Profile profile) [0x00106] in <511889694a624cc9a50e0e9b259b05c5>:0

2) Failed : Xamarin.MTouch.Profiling(watchOS)
  _mono_profiler_startup_log
  Expected: collection containing "_mono_profiler_startup_log"
  But was:  < "_xamarin_get_block_descriptor", "_mono_profiler_init_log" >
at Xamarin.MTouch.Profiling (Xamarin.Profile profile) [0x00106] in <511889694a624cc9a50e0e9b259b05c5>:0
```
mono/mono@826558a
deprecated the dash prefix for the mlpd path.

`noallocs` or `nocalls` are not needed, neither of them are default anymore.
the test was failing in that way:

> Executing link-keep-resources-2...
> [FAIL]	i18n 4/2 data files present: charinfo.nlp, collation.core.bin, collation.tailoring.bin, mscorlib.xml

also update the output, because it's actually expected at least three
elements.

fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=59277
@monojenkins
Copy link
Collaborator

Build failure

@monojenkins
Copy link
Collaborator

Build failure

@rolfbjarne
Copy link
Member

@lewurm there are some breaking changes in the BCL: https://jenkins.mono-project.com/job/xamarin-macios-pr-builder/5456/API_diff/, please review those to see if they're expected.

@monojenkins
Copy link
Collaborator

Build failure

@monojenkins
Copy link
Collaborator

Build failure

1 similar comment
@monojenkins
Copy link
Collaborator

Build failure

more fixes around conflicting paths when tests are run in parallel.
@monojenkins
Copy link
Collaborator

Build failure

@rolfbjarne
Copy link
Member

build

Copy link
Member

@rolfbjarne rolfbjarne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good once the breaking API has been reviewed and confirmed to be fine (and QA has approved).

@marek-safar
Copy link
Contributor

The API diff looks good from my POV. The BufferToBSTR mistake should not ideally happen but it was for a very short period of time and the API entry point is very unlikely used by anyone.

@monojenkins
Copy link
Collaborator

Build failure

@rolfbjarne
Copy link
Member

rolfbjarne commented Nov 7, 2017

It seems the Jenkins bot might be running out of disk space (https://github.com/xamarin/maccore/issues/570), but with a non-obvious error, so I'm not sure.

@rolfbjarne
Copy link
Member

build

@monojenkins
Copy link
Collaborator

Build failure

@lewurm
Copy link
Contributor Author

lewurm commented Nov 8, 2017

filed a bug for the test failure: https://bugzilla.xamarin.com/show_bug.cgi?id=60570
it's not a blocker for this merge. /cc @mandel-macaque

@GouriKumari
Copy link
Contributor

GouriKumari commented Nov 8, 2017

QA Passed Test Results:
New BCL tests in mono-2017-10: http://xqa-jenkins2.corp.microsoft.com:8080/job/XI/view/mono2017-10/job/bclunified-mono2017-10-newtests/2/testReport/XQA.iOS/iOSUnitTests/
BCL unified tests: http://xqa-jenkins2.corp.microsoft.com:8080/job/XI/view/mono2017-10/job/bclunified-mono-2017-10/6/testReport/XQA.iOS/iOSUnitTests/, Verified failed tests.
tvOS Unified Tests: http://xqa-jenkins2.corp.microsoft.com:8080/job/XI/view/mono2017-10/job/tvosunittests-mono-2017-10/5/testReport/XQA.iOS/TVOSUnitTests/
XIUnifies tests: Verified failed tests, http://xqa-jenkins2.corp.microsoft.com:8080/job/XI/view/mono2017-10/job/xiunifiedlongtests-mono-2017-10/5/testReport/XQA.iOS/iOSUnitTests/
Sample Tests: http://xqa-jenkins2.corp.microsoft.com:8080/job/XI/view/mono2017-10/job/xisamplebuilding-mono-2017-10/5/testReport/junit/XQA.iOS/XIBuildSamples/ (Verified failed tests). Verified failed tests. There are sample build failures if bundle identifiers are not set which is a new change in XI master. Samples are fixed and PR committed.
Two outstanding bugs:
https://bugzilla.xamarin.com/show_bug.cgi?id=60540
https://bugzilla.xamarin.com/show_bug.cgi?id=60536, https://bugzilla.xamarin.com/show_bug.cgi?id=60571, https://bugzilla.xamarin.com/show_bug.cgi?id=60572

XM Sample Builder: http://xqa-jenkins2.corp.microsoft.com/job/XM/view/mono2017-10/job/XMSampleBuilding-mono-2017-10/5/testReport/

There are four sample bugs which seems related to mono bump. This needs to be fixed asap before 15.6 preview. I didn't find any other major issues and it is ok to merge mono2017-10 to XI master.

@spouliot
Copy link
Contributor

https://bugzilla.xamarin.com/show_bug.cgi?id=60540 is unrelated to 2017-10, it exists in master

https://bugzilla.xamarin.com/show_bug.cgi?id=60571 seems a regression that was fixed in 2017-06 but maybe not backported to 2017-10 ? @vargaz ?

@spouliot spouliot removed the do-not-merge Do not merge this pull request label Nov 14, 2017
@luhenry
Copy link
Contributor

luhenry commented Nov 14, 2017

@spouliot https://bugzilla.xamarin.com/show_bug.cgi?id=60571 should be fixed with mono/mono#6005. Let me bump mono on this branch so we can have a build that QA can test

@monojenkins
Copy link
Collaborator

Build failure

Copy link
Contributor

@spouliot spouliot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can confirm #60571 works fine locally

@spouliot
Copy link
Contributor

The other issues are unrelated (seems to be an issue running them in parallel on mac). @luhenry unless someone else expressed concerns recently this can be merged into master :)

@lewurm lewurm merged commit 2018280 into master Nov 14, 2017
@mandel-macaque mandel-macaque deleted the mono-2017-10 branch December 7, 2021 20:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

requires-qa-before-merge The pull request requires QA to approve it before it can be merged run-all-tests Run all our tests.

Projects

None yet

Development

Successfully merging this pull request may close these issues.