Skip to content

[macos] Fix guiunit error on clean builds by depending on correct copy #2912

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

Jump to bottom
Merged
rolfbjarne merged 3 commits into from
Oct 20, 2017
Merged

[macos] Fix guiunit error on clean builds by depending on correct copy #2912

rolfbjarne merged 3 commits into from
Oct 20, 2017

Conversation

@chamons
Copy link
Contributor

@chamons chamons commented Oct 19, 2017

  • From a clean build making a BCL test would error due to the non-mobile guiunit not being built
  • This was because the Makefile-mac.inc target was incorrect
  • This was because xharness assumed that non variation based targets were always Modern
  • However, BCL tests are Full, not Modern

@chamons
[macos] Fix guiunit error on clean builds by depending on correct copy
b6d20e5 
- From a clean build making a BCL test would error due to the non-mobile guiunit not being built
- This was because the Makefile-mac.inc target was incorrect
- This was because xharness assumed that non variation based targets were always Modern
- However, BCL tests are Full, not Modern
@chamons chamons requested a review from rolfbjarne October 19, 2017 20:48
@chamons
Copy link
Contributor Author

chamons commented Oct 19, 2017

This is the diff in Makefile-mac.inc before and after the change:

https://gist.github.com/chamons/dad022be116730dcd10fbb1996e8f4dd

@monojenkins
Copy link
Collaborator

monojenkins commented Oct 19, 2017

Build success

rolfbjarne
rolfbjarne requested changes Oct 20, 2017
View reviewed changes
tests/xharness/Harness.cs Outdated
Harness = this,
IsNUnitProject = proj.IsNUnitProject,
};
}
Copy link
Member

@rolfbjarne rolfbjarne Oct 20, 2017

Choose a reason for hiding this comment

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

It looks like the target creations are identical except for a single parameter, so this could be replaced with:

MacUnifiedTarget = new MagUnifiedTarget (project.GenerateModern, false, true, true) {
    TemplateProject = file,
    Harness = this,
    IsNUnitProject = project.IsNUnitPorject,
};
unifiedTarget.Execute ();
hardcoded_unified_targets.Add (unifiedTarget);

Copy link
Contributor Author

@chamons chamons Oct 20, 2017

Choose a reason for hiding this comment

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

That's silly of me. I have no clue why I didn't see that. Fixing.

@monojenkins
Copy link
Collaborator

monojenkins commented Oct 20, 2017

Build failure

@monojenkins
Copy link
Collaborator

monojenkins commented Oct 20, 2017

Build success

@rolfbjarne rolfbjarne merged commit cdffea4 into dotnet:master Oct 20, 2017
mandel-macaque pushed a commit to mandel-macaque/xamarin-macios that referenced this pull request Oct 24, 2017
@chamons @mandel-macaque
[macos] Fix guiunit error on clean builds by depending on correct copy (
16b4f97 
dotnet#2912)

* [macos] Fix guiunit error on clean builds by depending on correct copy

- From a clean build making a BCL test would error due to the non-mobile guiunit not being built
- This was because the Makefile-mac.inc target was incorrect
- This was because xharness assumed that non variation based targets were always Modern
- However, BCL tests are Full, not Modern

* Code review change

* Swap to var to reduce diff
lewurm added a commit that referenced this pull request Nov 14, 2017
@lewurm
[runtime] integrate mono 2017-10 (#2905)
2018280 
* Update the function name used to initialize libmono-profiler-log, its called mono_profiler_init_log () now.

* [builds] Pass --with-cross-offsets= to crosstv's configure.

* Bump mono to 2017-08.

* Bump mono to 2017-08.

* Force disable 'futimens' and 'utimensat' so that we build with Xcode 9.

This is also needed to build with Xcode 8.3 on High Sierra.

* Remove old AppleTls implementation.

* Bump mono.

* Bump mono to 2017-08.

* Bump mono to 2017-08

* Reenable link-keep-resources-2 test

- This reverts commit 76b759e.
- 2017-08 has linker fix

* Bump mono to 2017-10

* Revert "Bump mono to 2017-10"

This reverts commit bb78327.

* Bump system mono to 2017-10

* Bump embedded mono to 2017-10

* [runtime] reflect eglib move

mono/mono@9be68f8

* bump mono

* [btouch] remove Security.Tls usage from test

* [mtouch tests] update the function name used to initialize libmono-profiler-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
```

* [mmptest] update log profiler options.

mono/mono@826558a
deprecated the dash prefix for the mlpd path.

`noallocs` or `nocalls` are not needed, neither of them are default anymore.

* [mmptest] fix link-keep-resources-2 test to cope with more corlib resources.

another corlib resource (mscorlib.xml) was added:

mono/mono@11e95169e787#diff-2d1c64decd91d9a6e8842ab0f0e9438d

* Revert "[mmptest] fix link-keep-resources-2 test to cope with more corlib resources."

This reverts commit 350eb3c.

* [XHarness] Add the Mono.Data.Tds tests.

* Address comments from rolf in the review.

* [mmp regresssion tests] bump mono linker, so mscorlib.xml gets stripped

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

* bump mono

fixes crash in tvOS: mono/mono#5812

* bump mono for updated BCL tests

see mono/mono#5820

* [mono] set 2017-10 branch in .gitmodules

* [macos] Fix guiunit error on clean builds by depending on correct copy (#2912)

* [macos] Fix guiunit error on clean builds by depending on correct copy

- From a clean build making a BCL test would error due to the non-mobile guiunit not being built
- This was because the Makefile-mac.inc target was incorrect
- This was because xharness assumed that non variation based targets were always Modern
- However, BCL tests are Full, not Modern

* Code review change

* Swap to var to reduce diff

* Revert changes in the paths for GuiUnit.

* [XHarness] Add the System.IO.Compression bcl tests. (#2918)

* [XHarness] Add the System.IO.Compression bcl tests.

*  [XHarness] Add bcl tests for System.IO.Compression.FileSystem. (#2924)

* [XHarness] Add the System.IO.Compression bcl tests.

* Ensure that resources are correctly copied in the bundles.

* [XHarness] Add bcl tests for System.IO.Compression.FileSystem.

* As per review, make the Mac test app name match the tests that are ran.

* [XHarness] Add Mono.CSharp tests on ios. (#2927)

* [XHarness] Add Mono.CSharp tests on ios.

* Bump mono to bring changes in the mono.csharp tests.

* [xtro-sharpie] fix TypeDefinition access due to Cecil change

* Bump mono

* bump mono

fixes
- https://bugzilla.xamarin.com/show_bug.cgi?id=60480
- https://bugzilla.xamarin.com/show_bug.cgi?id=60482

* bump mono

more fixes around conflicting paths when tests are run in parallel.

* Bump for mono/mono@2017-10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dalexsoto dalexsoto dalexsoto approved these changes

@rolfbjarne rolfbjarne rolfbjarne approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@chamons @monojenkins @dalexsoto @rolfbjarne @dnfclas