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

wimlib: init at 1.12.0 #31898

Merged
merged 2 commits into from Nov 21, 2017
Merged

wimlib: init at 1.12.0 #31898

merged 2 commits into from Nov 21, 2017

Conversation

andir
Copy link
Member

@andir andir commented Nov 21, 2017

Motivation for this change
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/)
    • I didn't specifically call / test all binaries. I succeeded building a WindowsPE image using it which seemed like a good enough test.
  • Fits CONTRIBUTING.md.

for testfile in tests/test-*; do
substituteInPlace $testfile --replace "/usr/bin/env bash" "${bash}/bin/bash"
wrapProgram $testfile --prefix PATH : ${lib.makeBinPath prefixPackages}
done
Copy link
Member

@Mic92 Mic92 Nov 21, 2017

Choose a reason for hiding this comment

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

Is patchShebangs . also able to fix shebangs here? Adding prefixPackages to buildInputs should also make wrapProgram superfluous.

@andir
Copy link
Member Author

andir commented Nov 21, 2017

patchShebangs just works. Thanks @Mic92 :-)

doCheck = true;

preCheck = ''
patchShebangs tests
Copy link
Member

Choose a reason for hiding this comment

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

Correct me if I am wrong, but the extra commands where not required to pass the test suite.

Copy link
Member Author

Choose a reason for hiding this comment

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

some of the tests are supposed to execute ntfs3g. The tests are setup in a way that skips execution if the optional binaries are not available.

Copy link
Member

Choose a reason for hiding this comment

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

the amount of skipped tests where the same in both cases, so I assume they cannot run in the build sandbox.

@Mic92 Mic92 merged commit cef1abb into NixOS:master Nov 21, 2017
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