Provide a configure flag to use the system doctest #915
Conversation
| * | ||
| * This module provides a convient way to import the requested doctest (the | ||
| * vendored version, or the system-provided one, as configured at build time) | ||
| * without having to remember to use the DOCTEST_HEADER macro in new files. |
There was a problem hiding this comment.
Let me know if you find this approach too "wacky". I'd be happy to just find all the imports for doctest.hh and replace them with the DOCTEST_HEADER macro instead if you prefer that approach.
bowlofeggs
force-pushed
the
optional_system_doctest
branch
from
84fe2f0
to
81cda32
Compare
| @@ -174,6 +177,7 @@ noinst_HEADERS = \ | |||
| db_sub_source.hh \ | |||
| doc_status_source.hh \ | |||
| doctest.hh \ | |||
| $(doctest_vendored_h) \ | |||
There was a problem hiding this comment.
My goal with this was to avoid building the bundled doctest when we are using the system one. If you know a better way I'm all ears!
This will allow distributions to more easily maintain incompatibilies between doctest and the rest of their software. Fixes tstack#912 Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
bowlofeggs
force-pushed
the
optional_system_doctest
branch
from
81cda32
to
85515b2
Compare
|
I haven't looked too closely yet, but I wanted to make a minor suggestion. I've recently added a |
Yeah I think that should be possible. Ergonomically, I think it might be good to keep a configure flag so that it explicitly fails when the system version was requested and not found (otherwise it could be confusing for distros who may believe they are using the system version and not the bundled one). What do you think? |
That sounds fine to me. Would you be able to make the change to move the doctest stuff to a dir in the |
|
I'd like to make a v0.10.1 release in the next few days. If you'd like this change to be a part of it, can you let me know if you have time to finish it off. |
Sure, I'd be happy to.
Unfortunately I might not have time to revisit this for a few days, so don't feel like I'll be disappointed if you release without this; it can wait. I can always carry a patch in Gentoo for a time if need be. |
|
Thanks! |
|
I also made the change to have it work by adjusting the include path in commit 954e368 |
Oh nice, this looks better than what I came up with. Thanks again! |
Backport tstack/lnav#915 so we can use the system doctest while we wait on a new lnav upstream release. Closes: https://bugs.gentoo.org/809752 Closes: https://bugs.gentoo.org/812353 Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
Backport tstack/lnav#915 so we can use the system doctest while we wait on a new lnav upstream release. Closes: https://bugs.gentoo.org/809752 Closes: https://bugs.gentoo.org/812353 Signed-off-by: Randy Barlow <randy@electronsweatshop.com> Closes: #22454 Signed-off-by: Sam James <sam@gentoo.org>
This will allow distributions to more easily maintain
incompatibilies between doctest and the rest of their software.
Fixes #912
Signed-off-by: Randy Barlow randy@electronsweatshop.com