This repository has been archived by the owner on Jul 4, 2023. It is now read-only.
Add RDM tests option to OLA #48575
Closed
Closed
Add RDM tests option to OLA #48575
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,14 +20,16 @@ class Ola < Formula | |
|
||
option :universal | ||
option "with-ftdi", "Install FTDI USB plugin for OLA." | ||
option "with-rdm-tests", "Install RDM Tests for OLA." | ||
# RDM tests require protobuf-c --with-python to work | ||
|
||
depends_on "pkg-config" => :build | ||
depends_on "cppunit" | ||
depends_on "protobuf-c" | ||
depends_on "libmicrohttpd" | ||
depends_on "libusb" | ||
depends_on "liblo" | ||
depends_on "ossp-uuid" | ||
depends_on "libusb" => :recommended | ||
depends_on "liblo" => :recommended | ||
depends_on :python => :optional | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this line redundant, now its been duplicated on line 44? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I chopped it in post before merging. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ah yes, just spotted that. Thanks. |
||
depends_on "doxygen" => :optional | ||
|
||
|
@@ -36,6 +38,12 @@ class Ola < Formula | |
depends_on "libftdi0" | ||
end | ||
|
||
if build.with? "rdm-tests" | ||
depends_on :python if MacOS.version <= :snow_leopard | ||
else | ||
depends_on :python => :optional | ||
end | ||
|
||
def install | ||
ENV.universal_binary if build.universal? | ||
|
||
|
@@ -47,6 +55,7 @@ def install | |
] | ||
|
||
args << "--enable-python-libs" if build.with? "python" | ||
args << "--enable-rdm-tests" if build.with? "rdm-tests" | ||
args << "--enable-doxygen-man" if build.with? "doxygen" | ||
|
||
system "autoreconf", "-fvi" if build.head? | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a :test dependency flag? We only need cppunit for the tests.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, there isn't.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay thanks. Any plans to do so? If I understand your bottle concept correctly, will that not still drag the test deps in, despite the fact your unlikely to bother testing the binary?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd like to add a TODO if there's an issue covering adding a :test dependency flag.