Page MenuHomeFreeBSD

kyua: Fixes after vendor merge
AcceptedPublic

Authored by igoro on Wed, Oct 7, 9:33 PM.
Tags
None
Referenced Files
F175249427: D60446.id188999.diff
Fri, Oct 9, 10:27 AM
F175191510: D60446.id188999.diff
Fri, Oct 9, 12:00 AM
F175172581: D60446.id188999.diff
Thu, Oct 8, 8:47 PM
Unknown Object (File)
Thu, Oct 8, 5:31 AM
Subscribers

Details

Reviewers
ngie

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 77820
Build 74703: arc lint + arc unit

Event Timeline

igoro requested review of this revision.Wed, Oct 7, 9:33 PM

It seems the recent vendor merge was mostly like an override. This is the set of fixes I identified so far.

I plan to eventually bring them to github/freebsd/kyua to avoid the difference in the future.

Please submit this change upstream so I can integrate them into the next release.
I ran into so many conflicts that I just chose the upstream version of files by default. I want to get out of that habit by getting things to converge again between the copy in the FreeBSD src tree and on GitHub.

This revision is now accepted and ready to land.Thu, Oct 8, 6:25 AM
contrib/kyua/os/freebsd/main.cpp
62–69

Sidenote: these calls should use std::make_shared(..) instead of std::shared_ptr(..) with new.

Please submit this change upstream so I can integrate them into the next release.
I ran into so many conflicts that I just chose the upstream version of files by default. I want to get out of that habit by getting things to converge again between the copy in the FreeBSD src tree and on GitHub.

Yeah, I expected that merge might face some troubles, and I had in my plans to help you after the merge. That's why I was manually examining the diff between "before" and "after the merge".

I will upstream "kyua prepare" first, and these fixes after, due to the dependencies.

igoro marked an inline comment as done.Thu, Oct 8, 9:50 PM
igoro added inline comments.
contrib/kyua/os/freebsd/main.cpp
62–69

Sidenote: these calls should use std::make_shared(..) instead of std::shared_ptr(..) with new.

Nice catch, thanks. Migrated to std::make_shared<>().