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

libhttpseverywhere: fix build (tests) #37546

Merged
merged 1 commit into from Mar 21, 2018
Merged

Conversation

xeji
Copy link
Contributor

@xeji xeji commented Mar 21, 2018

Motivation for this change

Tests failed after update to v0.8 (wrong directory).

/cc ZHF #36453

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: libhttpseverywhere

Partial log (click to expand)

shrinking /nix/store/j9kj475bzh3y3rsgrnrwgp73jm0nk52c-libhttpseverywhere-0.8.0/lib/libhttpseverywhere-0.8.so.0.8.0
strip is /nix/store/3zq400fri5dv7d30lpxlqm2v9y1iis6j-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/j9kj475bzh3y3rsgrnrwgp73jm0nk52c-libhttpseverywhere-0.8.0/lib
patching script interpreter paths in /nix/store/j9kj475bzh3y3rsgrnrwgp73jm0nk52c-libhttpseverywhere-0.8.0
checking for references to /build in /nix/store/j9kj475bzh3y3rsgrnrwgp73jm0nk52c-libhttpseverywhere-0.8.0...
shrinking RPATHs of ELF executables and libraries in /nix/store/cphm2lzmn7gwqihw7g53fvlcpnpmllg1-libhttpseverywhere-0.8.0-devdoc
strip is /nix/store/3zq400fri5dv7d30lpxlqm2v9y1iis6j-binutils-2.28.1/bin/strip
patching script interpreter paths in /nix/store/cphm2lzmn7gwqihw7g53fvlcpnpmllg1-libhttpseverywhere-0.8.0-devdoc
checking for references to /build in /nix/store/cphm2lzmn7gwqihw7g53fvlcpnpmllg1-libhttpseverywhere-0.8.0-devdoc...
/nix/store/j9kj475bzh3y3rsgrnrwgp73jm0nk52c-libhttpseverywhere-0.8.0

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: libhttpseverywhere

Partial log (click to expand)

shrinking /nix/store/2dlc3iix39080sqd43zyz43lc0cyz600-libhttpseverywhere-0.8.0/lib/libhttpseverywhere-0.8.so.0.8.0
strip is /nix/store/fzcs0fn6bb04m82frhlb78nc03ny3w55-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/2dlc3iix39080sqd43zyz43lc0cyz600-libhttpseverywhere-0.8.0/lib
patching script interpreter paths in /nix/store/2dlc3iix39080sqd43zyz43lc0cyz600-libhttpseverywhere-0.8.0
checking for references to /build in /nix/store/2dlc3iix39080sqd43zyz43lc0cyz600-libhttpseverywhere-0.8.0...
shrinking RPATHs of ELF executables and libraries in /nix/store/hbwbxf3mxbrw2mb980p1xsw0kqlc49dk-libhttpseverywhere-0.8.0-devdoc
strip is /nix/store/fzcs0fn6bb04m82frhlb78nc03ny3w55-binutils-2.28.1/bin/strip
patching script interpreter paths in /nix/store/hbwbxf3mxbrw2mb980p1xsw0kqlc49dk-libhttpseverywhere-0.8.0-devdoc
checking for references to /build in /nix/store/hbwbxf3mxbrw2mb980p1xsw0kqlc49dk-libhttpseverywhere-0.8.0-devdoc...
/nix/store/2dlc3iix39080sqd43zyz43lc0cyz600-libhttpseverywhere-0.8.0

@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {

doCheck = true;

checkPhase = "./httpseverywhere_test";
checkPhase = "cd test && ./httpseverywhere_test && cd ..";
Copy link
Contributor

Choose a reason for hiding this comment

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

I think more typical is (cd test && ./httpseverywhere_test) so you don't need to cd back.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thanks, that look better.

run tests in correct directory
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: libhttpseverywhere

Partial log (click to expand)

shrinking /nix/store/xfbycjzikdc7pcg3i81zcmxyhm1sybr6-libhttpseverywhere-0.8.0/lib/libhttpseverywhere-0.8.so.0.8.0
strip is /nix/store/fzcs0fn6bb04m82frhlb78nc03ny3w55-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/xfbycjzikdc7pcg3i81zcmxyhm1sybr6-libhttpseverywhere-0.8.0/lib
patching script interpreter paths in /nix/store/xfbycjzikdc7pcg3i81zcmxyhm1sybr6-libhttpseverywhere-0.8.0
checking for references to /build in /nix/store/xfbycjzikdc7pcg3i81zcmxyhm1sybr6-libhttpseverywhere-0.8.0...
shrinking RPATHs of ELF executables and libraries in /nix/store/has98rj9qd3r0rx0c8gjmzxsrqkni6c7-libhttpseverywhere-0.8.0-devdoc
strip is /nix/store/fzcs0fn6bb04m82frhlb78nc03ny3w55-binutils-2.28.1/bin/strip
patching script interpreter paths in /nix/store/has98rj9qd3r0rx0c8gjmzxsrqkni6c7-libhttpseverywhere-0.8.0-devdoc
checking for references to /build in /nix/store/has98rj9qd3r0rx0c8gjmzxsrqkni6c7-libhttpseverywhere-0.8.0-devdoc...
/nix/store/xfbycjzikdc7pcg3i81zcmxyhm1sybr6-libhttpseverywhere-0.8.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: libhttpseverywhere

Partial log (click to expand)

shrinking /nix/store/r297axwdr0dz8b2rdbx465vsxv13nz1h-libhttpseverywhere-0.8.0/lib/libhttpseverywhere-0.8.so.0.8.0
strip is /nix/store/3zq400fri5dv7d30lpxlqm2v9y1iis6j-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/r297axwdr0dz8b2rdbx465vsxv13nz1h-libhttpseverywhere-0.8.0/lib
patching script interpreter paths in /nix/store/r297axwdr0dz8b2rdbx465vsxv13nz1h-libhttpseverywhere-0.8.0
checking for references to /build in /nix/store/r297axwdr0dz8b2rdbx465vsxv13nz1h-libhttpseverywhere-0.8.0...
shrinking RPATHs of ELF executables and libraries in /nix/store/7rq5naanr138qwmnf2gc3cpdcql8q9bz-libhttpseverywhere-0.8.0-devdoc
strip is /nix/store/3zq400fri5dv7d30lpxlqm2v9y1iis6j-binutils-2.28.1/bin/strip
patching script interpreter paths in /nix/store/7rq5naanr138qwmnf2gc3cpdcql8q9bz-libhttpseverywhere-0.8.0-devdoc
checking for references to /build in /nix/store/7rq5naanr138qwmnf2gc3cpdcql8q9bz-libhttpseverywhere-0.8.0-devdoc...
/nix/store/r297axwdr0dz8b2rdbx465vsxv13nz1h-libhttpseverywhere-0.8.0

@dezgeg dezgeg merged commit fa50e90 into NixOS:master Mar 21, 2018
@dezgeg
Copy link
Contributor

dezgeg commented Mar 21, 2018

Cherry-picked to 18.03 in 5995e9c, thanks.

@xeji xeji deleted the p/libhttpseverywhere branch March 21, 2018 21:36
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

3 participants