Skip to content

Build test scripts whenever CopyNativeProjectBinaries builds - #37028

Merged
sdmaclea merged 1 commit into
dotnet:dev/infrastructurefrom
sdmaclea:infra/fixDevTestBuild
May 27, 2020
Merged

Build test scripts whenever CopyNativeProjectBinaries builds#37028
sdmaclea merged 1 commit into
dotnet:dev/infrastructurefrom
sdmaclea:infra/fixDevTestBuild

Conversation

@sdmaclea

@sdmacleasdmaclea commented May 26, 2020

Copy link
Copy Markdown
Contributor

In the original PR, I had triggered CreateExecuteScript on ResolveCmakeNativeProjectReference or something similarly esoteric. @jkoritzinsky wisely asked me to clean up the style.

However when I did, I broke building in a normal developer workflow.

The intent of this change is to build the tests scripts during build, except when /p:CopyNativeProjectBinaries=false which is used in CI to split the native copying to a later stage.
Then we will build during CopyAllNativeProjectReferenceBinaries.

@trylek Has another working solution if it is preferred...

@ghost

ghost commented May 26, 2020

Copy link
Copy Markdown

Tagging subscribers to this area: @ViktorHofer
Notify danmosemsft if you want to be subscribed.

@sdmacleasdmaclea added area-Infrastructure-coreclr Only use for closed issues and removed area-Infrastructure labels May 26, 2020
trylek
trylek approved these changes May 26, 2020
View reviewed changes

@trylektrylek left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I believe that your fix is better than the one I produced earlier today. Thank you!

@sdmaclea
sdmaclea merged commit 6b98352 into dotnet:dev/infrastructureMay 27, 2020
@sdmaclea
sdmaclea deleted the infra/fixDevTestBuild branch May 27, 2020 19:44
jashook pushed a commit that referenced this pull request Jun 4, 2020
Jarret Shook@sdmaclea
@trylek@safern@akoeplinger@dotnet-maestro@AndyAyersMS@am11@Gnbrkm41@monojenkins@thaystg@ViktorHofer@AaronRobinsonMSFT@vcsjones@bartonjs@EgorBo@nattress@lambdageek@krwq@kunalspathak@CarolEidt@weitzhandler@stephentoub@layomiaDan Moseley@eiriktsarpalis@jkoritzinsky@joperezr@flamencist@MihaZupanSergey Andreenko@NikolaMilosavljevic@steveisok@davidwrighton@buyaa-n@VSadov@lpereira@swaroop-sridhar@ManickaP@MichalStrehovsky@mangod9@BruceForstall@alexischr@BrzVlad@alfredmyers@NickCraverNathan Ricci@YohDeadfall@eerhardt@directhex@janvorli@Anipik@Marusyk@vargaz@Youssef1313@benaadams@marek-safar@AntonLapounov@AraHaan@tmds@wfurtTomas Weinfurt@jozkee@sywhang@GrabYourPitchforks@davmason@UnityAlex@fanyang-mono@tannergooding@echesakov@radical@ivdiazsa@gbalykov@shadow-cs@ericstj@skill-bit@CoffeeFlux@sakno@saucecontrol@ww898@jkotas@w-flo@PeterSolMS@grendello@lateralusX@eanova@mmitche@JoshSchreuderJosh Schreuder@cshung@erozenfeld@kjpou1@0xfk0Tomas Weinfurt
Dev infra master merge1 (#37274)
9e09fe3
* Build all managed coreclr tests on OSX in CI (#36253)
Remove concept of targetGeneric and targetSpecific
Add OSX corelcr managed tests builds to all pipes
Remove all other platform coreclr managed test build
Remove property `TestUnsupportedOutsideWindows`
Rename conditional `DisableProjectBuild` to `CLRTestTargetUnsupported`
Refactor tests to allow all managed tests to be built on OSX.
Split managed tests which based on target properties conditionally:
+ `<Compile Include/>`
+ `<DefineConstant/>`
This creates a separate test for each target configuration permutation.
Add `<CLRTestTargetUnsupported/>` conditions to select these at build and/or
run time
Append split tests with `_Target*` to identify intended test target
For tests which depend on target specific internal details od System.Private.Corlib,
expose a dummy implementation for unsupported targets.
Clean up
Remove <TraitTags/>
Remove <CLRTestNeedTarget/>
Remove managedOSXBuild
Remove managedTestBuildOsGroup
Remove managedTestBuildOsSubGroup
Use issues.target to disable expected failures
Some tests are configured to run on a targets with
specific charecteristics.
Use issues.targets to conditionally disable tests
not intended to run on all targets.
* Setup pr and batch runs for dev/infrsatructure (#36218) (#36299)
Co-authored-by: Jarret Shook <jashoo@microsoft.com>
* Add alias CoreClrTestBuildHost (#36256)
* Add alias CoreClrTestBuildHost
Intended to allow easy switching of test build host between OSX_x64 & Linux_x64
depending on availablility and reliability.
* Add missing issues.targets from #36253 (#36351)
* Add missing issues.targets from #36253
PR #36253 enabled building all tests on OSX. It was intended to include this list of
tests to disable on unsupported platforms. This was dropped as part of rebasing for
dev/infra branch.
Lack of CI on dev/infra allowed this to be missed.
* Revise issues.targets
* Add src/coreclr/tests/src/baseservices/typeequivalence/simple
* Remove #if Windows from DllImportPathTest
* Build scripts while copying native binaries (#36482)
* Build scripts while copying native binaries
Stop building test scripts during the managed build phase
Build after copying the native targets
Fixes issues relative to building scripts on OSX
* Fix superpmi script generation
* Cleanup issues.targets
* Keep 6 failing IJW tests
* Fix IJW when managed tests are built on OSX (#36711)
* Fix IJW when managed tests are built on OSX
- Refactor Interop.setting.targets to Directory.Build.{targets,props}
- Remove include Interop.setting.targets from interop projects rely on SDK including
Directory.Build.* automatically
- Add new CopyInteropNativeRuntimeDependencies target for copying IJW dependencies
* Add <Copy/> task
- Delete obsolete instruction in Interop/ReadMe.md
* Cleanup Readme.md
* Optional stress dependencies & don't populate CORE_ROOT twice (#36851)
Bruce noticed that we're downloading and installing stress
runtime dependencies several times during build. I have added a new
option to suppress this behavior in build-test and I fixed the
invocations of build-test based on Bruce's analysis. I have also
patched the build scripts to avoid populating CORE_ROOT in
"copynativeonly" mode.
Thanks
Tomas
Fixes: #36797
* Build test scripts whenever CopyNativeProjectBinaries builds (#37028)
* Fix pri0 test build.
* Clean pri1 test build (#37266)
* Clean pri1 test build
* Undo testing comment
* Make sure weakreferencetest does not run on unix
* Fixup WinRT proj
* Fix path
Co-authored-by: Steve MacLean <Steve.MacLean@microsoft.com>
Co-authored-by: Tomáš Rylek <trylek@microsoft.com>
Co-authored-by: Santiago Fernandez Madero <safern@microsoft.com>
Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Andy Ayers <andya@microsoft.com>
Co-authored-by: Adeel Mujahid <adeelbm@outlook.com>
Co-authored-by: Ganbarukamo41 <ganbarukamo@gmail.com>
Co-authored-by: monojenkins <jo.shields+jenkins@xamarin.com>
Co-authored-by: thaystg <thaystg@users.noreply.github.com>
Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
Co-authored-by: Aaron Robinson <arobins@microsoft.com>
Co-authored-by: Kevin Jones <kevin@vcsjones.com>
Co-authored-by: Jeremy Barton <jbarton@microsoft.com>
Co-authored-by: Egor Bogatov <egorbo@gmail.com>
Co-authored-by: Simon Nattress <nattress@gmail.com>
Co-authored-by: Aleksey Kliger (λgeek) <alklig@microsoft.com>
Co-authored-by: Krzysztof Wicher <kwicher@microsoft.com>
Co-authored-by: Kunal Pathak <Kunal.Pathak@microsoft.com>
Co-authored-by: Carol Eidt <carol.eidt@microsoft.com>
Co-authored-by: Shimmy <2716316+weitzhandler@users.noreply.github.com>
Co-authored-by: Stephen Toub <stoub@microsoft.com>
Co-authored-by: Layomi Akinrinade <laakinri@microsoft.com>
Co-authored-by: Dan Moseley <danmose@microsoft.com>
Co-authored-by: Eirik Tsarpalis <eirik.tsarpalis@gmail.com>
Co-authored-by: Jeremy Koritzinsky <jekoritz@microsoft.com>
Co-authored-by: Jose Perez Rodriguez <joperezr@microsoft.com>
Co-authored-by: Alexander Chermyanin <flamencist@mail.ru>
Co-authored-by: Miha Zupan <mihazupan.zupan1@gmail.com>
Co-authored-by: Sergey Andreenko <seandree@microsoft.com>
Co-authored-by: Nikola Milosavljevic <nikolam@microsoft.com>
Co-authored-by: Steve Pfister <steveisok@users.noreply.github.com>
Co-authored-by: David Wrighton <davidwr@microsoft.com>
Co-authored-by: buyaa-n <bunamnan@microsoft.com>
Co-authored-by: Krzysztof Wicher <mordotymoja@gmail.com>
Co-authored-by: Vladimir Sadov <vsadov@microsoft.com>
Co-authored-by: Leandro Pereira <leandro.pereira@microsoft.com>
Co-authored-by: Swaroop Sridhar <swaroop.sridhar@microsoft.com>
Co-authored-by: Marie Píchová <11718369+ManickaP@users.noreply.github.com>
Co-authored-by: Michal Strehovský <MichalStrehovsky@users.noreply.github.com>
Co-authored-by: Manish Godse <61718172+mangod9@users.noreply.github.com>
Co-authored-by: Bruce Forstall <brucefo@microsoft.com>
Co-authored-by: Alexis Christoforides <alexis@thenull.net>
Co-authored-by: BrzVlad <BrzVlad@users.noreply.github.com>
Co-authored-by: Alfred Myers <git@alfredmyers.com>
Co-authored-by: Nick Craver <nrcraver@gmail.com>
Co-authored-by: Nathan Ricci <naricc@microsoft.com>
Co-authored-by: Thays Grazia <thaystg@gmail.com>
Co-authored-by: Yoh Deadfall <yoh.deadfall@hotmail.com>
Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>
Co-authored-by: Jo Shields <directhex@apebox.org>
Co-authored-by: Jan Vorlicek <janvorli@microsoft.com>
Co-authored-by: Anirudh Agnihotry <anirudhagnihotry098@gmail.com>
Co-authored-by: Roman Marusyk <Marusyk@users.noreply.github.com>
Co-authored-by: Zoltan Varga <vargaz@gmail.com>
Co-authored-by: Youssef Victor <31348972+Youssef1313@users.noreply.github.com>
Co-authored-by: Ben Adams <thundercat@illyriad.co.uk>
Co-authored-by: Marek Safar <marek.safar@gmail.com>
Co-authored-by: Anton Lapounov <antonl@microsoft.com>
Co-authored-by: AraHaan <15173749+AraHaan@users.noreply.github.com>
Co-authored-by: Tom Deseyn <tom.deseyn@gmail.com>
Co-authored-by: Tomas Weinfurt <tweinfurt@yahoo.com>
Co-authored-by: Tomas Weinfurt <furt@Shining.local>
Co-authored-by: David Cantu <dacantu@microsoft.com>
Co-authored-by: Sung Yoon Whang <suwhang@microsoft.com>
Co-authored-by: Levi Broderick <GrabYourPitchforks@users.noreply.github.com>
Co-authored-by: vargaz <vargaz@users.noreply.github.com>
Co-authored-by: David Mason <davmason@microsoft.com>
Co-authored-by: UnityAlex <UnityAlex@users.noreply.github.com>
Co-authored-by: Fan Yang <52458914+fanyang-mono@users.noreply.github.com>
Co-authored-by: Tanner Gooding <tagoo@outlook.com>
Co-authored-by: Egor Chesakov <Egor.Chesakov@microsoft.com>
Co-authored-by: radical <radical@users.noreply.github.com>
Co-authored-by: Ivan Diaz Sanchez <ivdiazsa@microsoft.com>
Co-authored-by: Gleb Balykov <g.balykov@samsung.com>
Co-authored-by: Honza Rameš <ramejan@gmail.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
Co-authored-by: Ivan <ivanbuha@outlook.com>
Co-authored-by: Ryan Lucia <rylucia@microsoft.com>
Co-authored-by: SRV <roman.sakno@gmail.com>
Co-authored-by: Clinton Ingram <clinton.ingram@outlook.com>
Co-authored-by: Mikhail Pilin <ww898@users.noreply.github.com>
Co-authored-by: Jan Kotas <jkotas@microsoft.com>
Co-authored-by: w-flo <w-flo@users.noreply.github.com>
Co-authored-by: Peter Sollich <petersol@microsoft.com>
Co-authored-by: grendello <grendello@users.noreply.github.com>
Co-authored-by: Johan Lorensson <lateralusx.github@gmail.com>
Co-authored-by: Erhan Atesoglu <47518605+eanova@users.noreply.github.com>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
Co-authored-by: Josh Schreuder <joshschreuder@gmail.com>
Co-authored-by: Josh Schreuder <josh.schreuder@gmail.com>
Co-authored-by: Andrew Au <andrewau@microsoft.com>
Co-authored-by: Eugene Rozenfeld <erozen@microsoft.com>
Co-authored-by: Vlad Brezae <brezaevlad@gmail.com>
Co-authored-by: Kenneth Pouncey <kjpou@pt.lu>
Co-authored-by: Kirill Frolov <k.frolov@samsung.com>
Co-authored-by: Tomas Weinfurt <furt@DESKTOP-0J9757E.corp.microsoft.com>
@ghostghost locked as resolved and limited conversation to collaborators Dec 9, 2020
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@trylektrylektrylek approved these changes
@jkoritzinskyjkoritzinskyAwaiting requested review from jkoritzinsky
+1 more reviewer
@jashookjashookjashook approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area-Infrastructure-coreclrOnly use for closed issues

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@sdmaclea@jashook@trylek@Dotnet-GitSync-Bot