| Message ID | 20240822095045.72643-5-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | linux-user/flatload: Take mmap_lock in load_flt_binary() | expand |
On 22/08/2024 11.50, Philippe Mathieu-Daudé wrote: > When this test was added in commit 8011837a01, self.workdir was > set to the test directory. As of this commit, it is not set > anymore. Rather than using a full path to the busybox binary, > we can run it in the current directory, effectively kludging > the fact that self.workdir is not set. Good enough to run the > test: > > Fetching asset from tests/avocado/load_bflt.py:LoadBFLT.test_stm32 > JOB ID : 020d317281b042f46ad99013530d29df0f1d7eb7 > JOB LOG : tests/results/job-2024-08-22T10.17-020d317/job.log > (1/1) tests/avocado/load_bflt.py:LoadBFLT.test_stm32: PASS (0.09 s) > RESULTS : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 0 > JOB TIME : 0.62 s > > Reported-by: Thomas Huth <thuth@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > tests/avocado/load_bflt.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/avocado/load_bflt.py b/tests/avocado/load_bflt.py > index bb50cec1ee..264489ee25 100644 > --- a/tests/avocado/load_bflt.py > +++ b/tests/avocado/load_bflt.py > @@ -41,7 +41,7 @@ def test_stm32(self): > 'Stm32_mini_rootfs.cpio.bz2') > rootfs_hash = '9f065e6ba40cce7411ba757f924f30fcc57951e6' > rootfs_path_bz2 = self.fetch_asset(rootfs_url, asset_hash=rootfs_hash) > - busybox_path = os.path.join(self.workdir, "/bin/busybox") > + busybox_path = os.path.join(self.workdir, "bin/busybox") Good enough for now, indeed. Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/tests/avocado/load_bflt.py b/tests/avocado/load_bflt.py index bb50cec1ee..264489ee25 100644 --- a/tests/avocado/load_bflt.py +++ b/tests/avocado/load_bflt.py @@ -41,7 +41,7 @@ def test_stm32(self): 'Stm32_mini_rootfs.cpio.bz2') rootfs_hash = '9f065e6ba40cce7411ba757f924f30fcc57951e6' rootfs_path_bz2 = self.fetch_asset(rootfs_url, asset_hash=rootfs_hash) - busybox_path = os.path.join(self.workdir, "/bin/busybox") + busybox_path = os.path.join(self.workdir, "bin/busybox") self.extract_cpio(rootfs_path_bz2)
When this test was added in commit 8011837a01, self.workdir was set to the test directory. As of this commit, it is not set anymore. Rather than using a full path to the busybox binary, we can run it in the current directory, effectively kludging the fact that self.workdir is not set. Good enough to run the test: Fetching asset from tests/avocado/load_bflt.py:LoadBFLT.test_stm32 JOB ID : 020d317281b042f46ad99013530d29df0f1d7eb7 JOB LOG : tests/results/job-2024-08-22T10.17-020d317/job.log (1/1) tests/avocado/load_bflt.py:LoadBFLT.test_stm32: PASS (0.09 s) RESULTS : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 0 JOB TIME : 0.62 s Reported-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- tests/avocado/load_bflt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)