00c86ad · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

Merge #129412: makeself: disable tests for now

commit00c86ad14639887ec495b92ada9cd93a75317686 authorVladimír Čunát <v@cunat.cz> dateTue 6 Jul 2021, 21:07 (5 years ago) parentae54500 f526256

3 files changed+5−12

unifiedsplit

pkgs/applications/misc/makeself/default.nix+4−2

@@ -12,10 +12,12 @@ stdenv.mkDerivation rec {

1212 sha256 = "07cq7q71bv3fwddkp2863ylry2ivds00f8sjy8npjpdbkailxm21";

1313 };

1414

15− patches = [ ./tests-use-better-shell.patch ];

1615 postPatch = "patchShebangs test";

1716

18− doCheck = true;

17+ # Issue #110149: our default /bin/sh apparently has 32-bit math only

18+ # (attribute busybox-sandbox-shell), and that causes problems

19+ # when running these tests inside build, based on free disk space.

20+ doCheck = false;

1921 checkTarget = "test";

2022 checkInputs = [ which zstd pbzip2 ];

2123

pkgs/applications/misc/makeself/tests-use-better-shell.patchdeleted−10

@@ -1,10 +0,0 @@

1−Use full bash's sh in tests instead of /bin/sh, as that would be

2−too minimalist in the build sandbox. See issue:

3−https://github.com/NixOS/nixpkgs/issues/110149#issuecomment-874258128

4−diff --git a/test/extracttest b/test/extracttest

5−--- a/test/extracttest

6−+++ b/test/extracttest

7−@@ -9,2 +9,3 @@ setupTests() {

8− $SUT $* archive makeself-test.run "Test $*" echo Testing

9−+ sed "1s|/bin|$(dirname "$SHELL")|" -i ./makeself-test.run

10− }

pkgs/os-specific/linux/busybox/sandbox-shell.nix+1

@@ -8,6 +8,7 @@ busybox.override {

88 CONFIG_FEATURE_FANCY_ECHO y

99 CONFIG_FEATURE_SH_MATH y

1010 CONFIG_FEATURE_SH_MATH_64 y

11+ CONFIG_FEATURE_TEST_64 y

1112

1213 CONFIG_ASH y

1314 CONFIG_ASH_OPTIMIZE_FOR_SIZE y