JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4535cfe0ab
nixpkgs/pkgs/development/tools/build-managers/bmake/fix-unexport-env-test.patch

14 lines
474 B
Diff
Raw Normal View History

bmake: 20200902 -> 20210420 * Fix varmod-localtime test by setting TZ to an absolute path to the appropriate file in TZDIR. This avoids having an extra patch for musl which doesn't support TZDIR at all. * Move tests into checkPhase by applying patch from alpine * Fix build with musl by disabling deptgt-delete_on_error test (which I haven't debugged myself, just copied this from alpine) and fixing a test which fails due to differing output from strerror(3) between musl and glibc. Also we need to add a shebang to install-sh, otherwise it won't be executed in pkgsMusl.
2021-05-29 11:50:32 +01:00
--- bmake/unit-tests/unexport-env.mk.orig 2021-05-27 14:44:45.263392298 +0200
+++ bmake/unit-tests/unexport-env.mk 2021-05-27 14:46:46.188881996 +0200
@@ -4,8 +4,8 @@
FILTER_CMD= grep ^UT_
bmake: fix version/url, fix tests, remove unneeded deps As noted by @jameysharp in #63181. Signed-off-by: Austin Seipp <as@fastly.com>
2019-06-16 20:24:15 +01:00
.include "export.mk"
-# an example of setting up a minimal environment.
bmake: 20200902 -> 20210420 * Fix varmod-localtime test by setting TZ to an absolute path to the appropriate file in TZDIR. This avoids having an extra patch for musl which doesn't support TZDIR at all. * Move tests into checkPhase by applying patch from alpine * Fix build with musl by disabling deptgt-delete_on_error test (which I haven't debugged myself, just copied this from alpine) and fixing a test which fails due to differing output from strerror(3) between musl and glibc. Also we need to add a shebang to install-sh, otherwise it won't be executed in pkgsMusl.
2021-05-29 11:50:32 +01:00
-PATH= /bin:/usr/bin:/sbin:/usr/sbin
bmake: fix version/url, fix tests, remove unneeded deps As noted by @jameysharp in #63181. Signed-off-by: Austin Seipp <as@fastly.com>
2019-06-16 20:24:15 +01:00
+# preserve PATH so commands used in the "all" target are still available
bmake: 20200902 -> 20210420 * Fix varmod-localtime test by setting TZ to an absolute path to the appropriate file in TZDIR. This avoids having an extra patch for musl which doesn't support TZDIR at all. * Move tests into checkPhase by applying patch from alpine * Fix build with musl by disabling deptgt-delete_on_error test (which I haven't debugged myself, just copied this from alpine) and fixing a test which fails due to differing output from strerror(3) between musl and glibc. Also we need to add a shebang to install-sh, otherwise it won't be executed in pkgsMusl.
2021-05-29 11:50:32 +01:00
+PATH := ${PATH}
bmake: fix version/url, fix tests, remove unneeded deps As noted by @jameysharp in #63181. Signed-off-by: Austin Seipp <as@fastly.com>
2019-06-16 20:24:15 +01:00
# now clobber the environment to just PATH and UT_TEST
bmake: 20200902 -> 20210420 * Fix varmod-localtime test by setting TZ to an absolute path to the appropriate file in TZDIR. This avoids having an extra patch for musl which doesn't support TZDIR at all. * Move tests into checkPhase by applying patch from alpine * Fix build with musl by disabling deptgt-delete_on_error test (which I haven't debugged myself, just copied this from alpine) and fixing a test which fails due to differing output from strerror(3) between musl and glibc. Also we need to add a shebang to install-sh, otherwise it won't be executed in pkgsMusl.
2021-05-29 11:50:32 +01:00
UT_TEST= unexport-env
Reference in New Issue Copy Permalink