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

Feature/conan #938

Closed
wants to merge 3 commits into from
Closed

Feature/conan #938

wants to merge 3 commits into from

Conversation

uilianries
Copy link
Contributor

@uilianries uilianries commented Jun 23, 2017

Description

This PR brings a minimal Conan recipe to Catch project. It just copy single_header to Conan package.
To solve the tests, I just copied BDDTests and TrickyTest to validate Catch package.

In the future we could improve many other things (build all Catch project by Conan), but is a different feature.

Closes #926

- Insert catch.hpp (single header) to package
- Copy BDDTests and TrickyTest to validate Catch package

Signed-off-by: Uilian Ries <uilianries@gmail.com>
@memsharded
Copy link

I don't think so much testing for the package is necessary. With just a very minimal test inside test_package to ensure the package is correctly created is more than enough. Please @uilianries simplify, thanks!!

- Update release scripts to increment Conan version

Signed-off-by: Uilian Ries <uilianries@gmail.com>
@uilianries
Copy link
Contributor Author

@memsharded Done! I changed to a simple test (just 10 lines)

@philsquared
Copy link
Collaborator

What is the conanfile.py in test_package for? It has a hard coded version number that never gets updated - is that intended?

@memsharded
Copy link

The test_package is a folder containing a consumer project. It is used to make sure that packages are properly created, headers are packaged, libs are there... It is automatically used by the conan test_package command that manages to export the package recipe (the root conanfile.py) into the local cache, build the package, and consume the package from the test_package project to ensure everything is OK.

About the version in test_package/conanfile.py -> requires, good catch ;)
Yes, @uilianries, that version should be also changed by the updateConan, or maybe we can just wait. Next release will get rid of it, and the consumer test_package will not have to require the tested package explicitly.

@uilianries
Copy link
Contributor Author

@memsharded Thanks for the comments!

@philsquared I can change test_package/conanfile.py by updateConan in this PR, if you wish.

@philsquared
Copy link
Collaborator

Yes please - then I think we can get this in

@uilianries
Copy link
Contributor Author

@philsquared Done!

@philsquared
Copy link
Collaborator

That was quick! Thanks. I'll probably take a look tomorrow

Signed-off-by: Uilian Ries <uilianries@gmail.com>
@philsquared
Copy link
Collaborator

Thanks - I've now merged this.
In fact I did it in two parts, as I'd already merged, and tweaked, the version before that last update yesterday - so I just cherry-picked the last update on top of that.
That seems to have prevented GitHub from recognising that the whole PR has been merged so I'll close it manually here.

@uilianries
Copy link
Contributor Author

@philsquared and @memsharded Thanks!

@uilianries uilianries deleted the feature/conan branch June 30, 2017 13:00
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.

3 participants