cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Fix hotpatch: skip tests that assume .so files presence at hardcoded paths

Browse source
This commit is contained in:
Vladimir Kalnitsky 2022-11-27 19:00:03 +04:00
parent c32deeb053
commit cf5b4eae5f
2 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/hotpatch/default.nix
View file

@ -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
View 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;
}