[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/16] tests/docker: Fix _get_so_libs() for docker-binfmt-image
From: |
Alex Bennée |
Subject: |
[PULL 02/16] tests/docker: Fix _get_so_libs() for docker-binfmt-image |
Date: |
Mon, 8 Feb 2021 12:38:07 +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>
Message-Id: <20210202134001.25738-2-alex.bennee@linaro.org>
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
- [PULL 00/16] testing, gdbstub and doc tweaks, Alex Bennée, 2021/02/08
- [PULL 02/16] tests/docker: Fix _get_so_libs() for docker-binfmt-image,
Alex Bennée <=
- [PULL 05/16] tests/docker: preserve original name when copying libs, Alex Bennée, 2021/02/08
- [PULL 11/16] gdbstub: Fix handle_query_xfer_auxv, Alex Bennée, 2021/02/08
- [PULL 04/16] tests/docker: make _copy_with_mkdir accept missing files, Alex Bennée, 2021/02/08
- [PULL 08/16] configure: make version_ge more tolerant of shady version input, Alex Bennée, 2021/02/08
- [PULL 03/16] tests/docker: Fix typo in help message, Alex Bennée, 2021/02/08
- [PULL 12/16] tests/tcg: Replace /bin/true by true (required on macOS), Alex Bennée, 2021/02/08
- [PULL 07/16] tests/docker: add a docker-exec-copy-test, Alex Bennée, 2021/02/08
- [PULL 06/16] tests/docker: alias docker-help target for consistency, Alex Bennée, 2021/02/08
- [PULL 13/16] scripts/mtest2make.py: export all-%s-targets variable and use it, Alex Bennée, 2021/02/08
- [PULL 01/16] tests/acceptance: Increase the timeout in the replay tests, Alex Bennée, 2021/02/08