- a few fixes for handling ENABLEZMQCORE=OFF in the multiBroker cases, and fix an issue with config file not getting passed properly for using multibroker in the helics_broker app
phlptp
Showing 2 of 3 files from the diff.
src/helics/core/helicsCLI11.hpp
changed.
src/helics/apps/helics-broker.cpp
changed.
Other files ignored by Codecov
tests/helics/apps/MultiBrokerTests.cpp
has changed.
@@ -70,8 +70,8 @@
Loading
| 70 | 70 | last_output = parse_output::ok; |
|
| 71 | 71 | remArgs = remaining_for_passthrough(); |
|
| 72 | 72 | if (passConfig) { |
|
| 73 | - | auto* opt = get_option("--config"); |
|
| 74 | - | if (opt->count() > 0) { |
|
| 73 | + | auto* opt = get_option_no_throw("--config"); |
|
| 74 | + | if (opt != nullptr && opt->count() > 0) { |
|
| 75 | 75 | remArgs.push_back(opt->as<std::string>()); |
|
| 76 | 76 | remArgs.emplace_back("--config"); |
|
| 77 | 77 | } |
@@ -10,6 +10,7 @@
Loading
| 10 | 10 | #include "../core/Broker.hpp" |
|
| 11 | 11 | #include "../core/core-exceptions.hpp" |
|
| 12 | 12 | #include "../core/helicsCLI11.hpp" |
|
| 13 | + | #include "MultiBroker.hpp" |
|
| 13 | 14 | #include "gmlc/utilities/stringOps.h" |
|
| 14 | 15 | ||
| 15 | 16 | #ifdef HELICS_ENABLE_WEBSERVER |
@@ -22,7 +23,9 @@
Loading
| 22 | 23 | /** function to run the online terminal program*/ |
|
| 23 | 24 | void terminalFunction(std::vector<std::string> args); |
|
| 24 | 25 | ||
| 25 | - | int main(int argc, char* argv[]) |
|
| 26 | + | static const bool amb = helics::allowMultiBroker(); |
|
| 27 | + | ||
| 28 | + | int main(int argc, char* argv[]) //NOLINT |
|
| 26 | 29 | { |
|
| 27 | 30 | int ret{0}; |
|
| 28 | 31 | bool runterminal{false}; |
@@ -62,6 +65,7 @@
Loading
| 62 | 65 | return std::string{}; |
|
| 63 | 66 | }); |
|
| 64 | 67 | cmdLine.allow_extras(); |
|
| 68 | + | cmdLine.set_config(); |
|
| 65 | 69 | auto res = cmdLine.helics_parse(argc, argv); |
|
| 66 | 70 | if (res != helics::helicsCLI11App::parse_output::ok) { |
|
| 67 | 71 | switch (res) { |
| Files | Coverage |
|---|---|
| src/helics | 74.77% |
| Project Totals (207 files) | 74.77% |
10007.9
TRAVIS_OS_NAME=linux
10007.9
TRAVIS_OS_NAME=linux
| 1 |
codecov: |
| 2 |
notify: |
| 3 |
require_ci_to_pass: no |
| 4 |
branch: develop |
| 5 |
|
| 6 |
coverage: |
| 7 |
precision: 2 |
| 8 |
round: down |
| 9 |
range: "50...95" |
| 10 |
status: |
| 11 |
project: yes |
| 12 |
patch: yes |
| 13 |
changes: no |
| 14 |
|
| 15 |
parsers: |
| 16 |
gcov: |
| 17 |
branch_detection: |
| 18 |
conditional: yes |
| 19 |
loop: yes |
| 20 |
method: no |
| 21 |
macro: no |
| 22 |
|
| 23 |
comment: |
| 24 |
layout: "header, diff" |
| 25 |
behavior: default |
| 26 |
require_changes: no |
| 27 |
|
| 28 |
ignore: |
| 29 |
- "ThirdParty" |
| 30 |
- "examples" |
| 31 |
- "tests" |
| 32 |
- "interfaces" |
| 33 |
- "src/helics/core/mpi" |
| 34 |
- "**/logger.*" |
| 35 |
- "**/loggerCore.*" |
| 36 |
- "**/zmqHelper.*" |
| 37 |
- "src/helics/shared_api_library/internal/api_objects.h" |
Sunburst
The inner-most circle is the entire project, moving away from the center are folders then, finally, a single file.
The size and color of each slice is representing the number of statements and the coverage, respectively.
Icicle
The top section represents the entire project. Proceeding with folders and finally individual files.
The size and color of each slice is representing the number of statements and the coverage, respectively.
