Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(maint) Make tests compatible with leatherman 0.4 and 0.5 #396

Merged
merged 1 commit into from
Apr 19, 2016

Conversation

parisiale
Copy link
Contributor

Removing the Catch's applyCommandLine() and passing CLI arguments
directly to the Session::run() function; note that setting ConfigData
showDurations to "Always" works in the same way as it's not changed by
our CI pipeline via CLI.

@parisiale parisiale changed the title (maint) Make tests compatible with leathermnan 0.4 and 0.5 (maint) Make tests compatible with leatherman 0.4 and 0.5 Apr 19, 2016
Removing the Catch's applyCommandLine() and passing CLI arguments
directly to the Session::run() function; note that setting ConfigData
showDurations to "Always" works in the same way as it's not changed by
our CI pipeline via CLI.
@@ -16,28 +16,28 @@
#include <leatherman/logging/logging.hpp>
#endif

int main(int argc, const char** argv) {
int main(int argc, char** argv) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Why this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Different signature in Catch 1.4.0.

Copy link
Contributor

Choose a reason for hiding this comment

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

ok

@mruzicka
Copy link
Contributor

LGTM

@mruzicka mruzicka merged commit 55780f0 into puppetlabs:master Apr 19, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants