makeself: disable tests for now, working around #110149
I couldn't find an easy way to work around this while doing the tests, so let's disable them for now and work on fixing the sandbox shell instead (and re-enable tests after that is deployed; I hope).
This commit is contained in:
parent
faaa3bc131
commit
fa9f6c56a8
|
@ -12,10 +12,12 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "07cq7q71bv3fwddkp2863ylry2ivds00f8sjy8npjpdbkailxm21";
|
sha256 = "07cq7q71bv3fwddkp2863ylry2ivds00f8sjy8npjpdbkailxm21";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./tests-use-better-shell.patch ];
|
|
||||||
postPatch = "patchShebangs test";
|
postPatch = "patchShebangs test";
|
||||||
|
|
||||||
doCheck = true;
|
# Issue #110149: our default /bin/sh apparently has 32-bit math only
|
||||||
|
# (attribute busybox-sandbox-shell), and that causes problems
|
||||||
|
# when running these tests inside build, based on free disk space.
|
||||||
|
doCheck = false;
|
||||||
checkTarget = "test";
|
checkTarget = "test";
|
||||||
checkInputs = [ which zstd pbzip2 ];
|
checkInputs = [ which zstd pbzip2 ];
|
||||||
|
|
||||||
|
|
|
@ -1,10 +0,0 @@
|
||||||
Use full bash's sh in tests instead of /bin/sh, as that would be
|
|
||||||
too minimalist in the build sandbox. See issue:
|
|
||||||
https://github.com/NixOS/nixpkgs/issues/110149#issuecomment-874258128
|
|
||||||
diff --git a/test/extracttest b/test/extracttest
|
|
||||||
--- a/test/extracttest
|
|
||||||
+++ b/test/extracttest
|
|
||||||
@@ -9,2 +9,3 @@ setupTests() {
|
|
||||||
$SUT $* archive makeself-test.run "Test $*" echo Testing
|
|
||||||
+ sed "1s|/bin|$(dirname "$SHELL")|" -i ./makeself-test.run
|
|
||||||
}
|
|
Loading…
Reference in a new issue