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

Using set(EXECUTABLE testweb3) to bring the CMake file for the libweb… #88

Merged
merged 5 commits into from Dec 4, 2015
Merged

Using set(EXECUTABLE testweb3) to bring the CMake file for the libweb… #88

merged 5 commits into from Dec 4, 2015

Conversation

bobsummerwill
Copy link
Contributor

@bobsummerwill bobsummerwill commented Dec 3, 2015

…three tests in line with the other files.

This also fixes automated dependency graph generation.

…three tests in line with the other files.

This also fixes automated dependency graph generation.
@gavofyork
Copy link
Contributor

gavofyork commented Dec 3, 2015

build failing?

@bobsummerwill
Copy link
Contributor Author

bobsummerwill commented Dec 3, 2015

I can't see the logs, @gavofyork. Please could you cut-and-paste one? I assume they are all the same?

Merge pull request #76 from gluk256/_framing2

Because the change was not atomic, as indicated in its notes.
@@ -28,8 +28,7 @@ using namespace dev;
using namespace dev::p2p;
using namespace dev::shh;

WhisperPeer::WhisperPeer(std::shared_ptr<Session> _s, HostCapabilityFace* _h, unsigned _i, CapDesc const&, uint16_t _capID):
Copy link
Member

@subtly subtly Dec 4, 2015

Choose a reason for hiding this comment

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

Why the reversion?

Copy link
Contributor Author

@bobsummerwill bobsummerwill Dec 4, 2015

Choose a reason for hiding this comment

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

Trying to work out where the break came. It's not from my edits.

Build fails. Undo. Build fails. Redo. Build succeeds.
Sad face. That took a lot of hours :-(
@LefterisJP @gavofyork @chriseth.

Anyway - end result is this PR is now ready for merge, fixing the solidity module name inconsistency and the missing set(EXECUTABLE testweb3), now with some bonus messy history.

LefterisJP added a commit that referenced this issue Dec 4, 2015
Using set(EXECUTABLE testweb3) to bring the CMake file for the libweb…
@LefterisJP LefterisJP merged commit 55263dd into ethereum:develop Dec 4, 2015
7 checks passed
@bobsummerwill
Copy link
Contributor Author

bobsummerwill commented Dec 4, 2015

Thanks, @LefterisJP, and also for the PR-for-my-PR! Nearly there, eh?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants