Merge pull request #203278 from klntsky/klntsky/fix-hotpatch
Fix hotpatch: skip tests that assume .so files presence at hardcoded paths
This commit is contained in:
commit
f56d74c148
|
@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
|
|||
LD_LIBRARY_PATH=$(pwd)/src make test
|
||||
'';
|
||||
|
||||
patches = [ ./no-loader-test.patch ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Hot patching executables on Linux using .so file injection";
|
||||
homepage = src.meta.homepage;
|
||||
|
|
25
pkgs/development/libraries/hotpatch/no-loader-test.patch
Normal file
25
pkgs/development/libraries/hotpatch/no-loader-test.patch
Normal file
|
@ -0,0 +1,25 @@
|
|||
diff --git a/test/loader.c b/test/loader.c
|
||||
index 4e3dfdc..7f98d94 100644
|
||||
--- a/test/loader.c
|
||||
+++ b/test/loader.c
|
||||
@@ -54,20 +54,6 @@ int main(int argc, char **argv)
|
||||
assert(ret < 0);
|
||||
ret = ld_find_library(maps, mapnum, "libc", false, NULL, 6);
|
||||
assert(ret >= 0);
|
||||
-#if __WORDSIZE == 64
|
||||
- ret = ld_find_library(maps, mapnum, "/lib64/ld-linux-x86-64.so.2",
|
||||
- true, NULL, 6);
|
||||
- assert(ret >= 0);
|
||||
- ret = ld_find_library(maps, mapnum, "/lib/ld-linux-x86-64.so.2",
|
||||
- false, NULL, 6);
|
||||
-#else
|
||||
- ret = ld_find_library(maps, mapnum, "/lib/ld-linux.so.2",
|
||||
- true, NULL, 6);
|
||||
- assert(ret >= 0);
|
||||
- ret = ld_find_library(maps, mapnum, "/lib32/ld-linux.so.2",
|
||||
- false, NULL, 6);
|
||||
-#endif
|
||||
- assert(ret < 0);
|
||||
ld_free_maps(maps, mapnum);
|
||||
return 0;
|
||||
}
|
Loading…
Reference in a new issue