Unverified Commit 7d8a5dc2 authored by Alexander Bantyev's avatar Alexander Bantyev Committed by GitHub
Browse files

Merge pull request #203297 from NixOS/backport-203278-to-release-22.11 

[Backport release-22.11] Fix hotpatch: skip tests that assume .so files presence at hardcoded paths
parents a5ca17f3 48ff5653

pkgs/development/libraries/hotpatch/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -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;

pkgs/development/libraries/hotpatch/no-loader-test.patch

0 → 100644
+25 −0
Original line number Diff line number Diff line 
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;

 }