[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 1/6] tests/docker: Fix _get_so_libs() for docker-binfmt-image
From: |
Alex Bennée |
Subject: |
[PATCH v1 1/6] tests/docker: Fix _get_so_libs() for docker-binfmt-image |
Date: |
Tue, 19 Jan 2021 17:52:02 +0000 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Fix a variable rename mistake from commit 5e33f7fead5:
Traceback (most recent call last):
File "./tests/docker/docker.py", line 710, in <module>
sys.exit(main())
File "./tests/docker/docker.py", line 706, in main
return args.cmdobj.run(args, argv)
File "./tests/docker/docker.py", line 489, in run
_copy_binary_with_libs(args.include_executable,
File "./tests/docker/docker.py", line 149, in _copy_binary_with_libs
libs = _get_so_libs(src)
File "./tests/docker/docker.py", line 123, in _get_so_libs
libs.append(s.group(1))
NameError: name 's' is not defined
Fixes: 5e33f7fead5 ("tests/docker: better handle symlinked libs")
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210119050149.516910-1-f4bug@amsat.org>
---
tests/docker/docker.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 884dfeb29c..0b4f6167b3 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -120,7 +120,7 @@ def _get_so_libs(executable):
search = ldd_re.search(line)
if search:
try:
- libs.append(s.group(1))
+ libs.append(search.group(1))
except IndexError:
pass
except subprocess.CalledProcessError:
--
2.20.1
- [PATCH v1 0/6] testing/next (docker binfmt tests), Alex Bennée, 2021/01/19
- [PATCH v1 1/6] tests/docker: Fix _get_so_libs() for docker-binfmt-image,
Alex Bennée <=
- [PATCH v1 2/6] tests/docker: Fix typo in help message, Alex Bennée, 2021/01/19
- [PATCH v1 5/6] tests/docker: alias docker-help target for consistency, Alex Bennée, 2021/01/19
- [PATCH v1 6/6] tests/docker: add a docker-exec-copy-test, Alex Bennée, 2021/01/19
- [PATCH v1 4/6] tests/docker: preserve original name when copying libs, Alex Bennée, 2021/01/19
- [PATCH v1 3/6] tests/docker: make _copy_with_mkdir accept missing files, Alex Bennée, 2021/01/19