1. Patchew
  2. QEMU
  3. [PATCH v2 00/18] testing and semihosting pre-PR
  4. View patch

[PATCH v2 03/18] tests/lcitool: update to latest version

Alex Bennée posted 18 patches 3 years, 11 months ago
Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <f4bug@amsat.org>, Thomas Huth <thuth@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Eduardo Habkost <eduardo@habkost.net>, David Hildenbrand <david@redhat.com>
[PATCH v2 03/18] tests/lcitool: update to latest version
Posted by Alex Bennée 3 years, 11 months ago 
We will need an update shortly for some new images.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220211160309.335014-4-alex.bennee@linaro.org>
---
 tests/docker/dockerfiles/opensuse-leap.docker | 3 +--
 tests/docker/dockerfiles/ubuntu1804.docker    | 3 +--
 tests/docker/dockerfiles/ubuntu2004.docker    | 3 +--
 tests/lcitool/libvirt-ci                      | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
index 1b78d8369a..e1ad9434a3 100644
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -127,8 +127,7 @@ RUN zypper update -y && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 
-RUN pip3 install \
-         meson==0.56.0
+RUN pip3 install meson==0.56.0
 
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker
index 699f2dfc6a..0a622b467c 100644
--- a/tests/docker/dockerfiles/ubuntu1804.docker
+++ b/tests/docker/dockerfiles/ubuntu1804.docker
@@ -134,8 +134,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 
-RUN pip3 install \
-         meson==0.56.0
+RUN pip3 install meson==0.56.0
 
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker
index 87513125b8..b9d06cb040 100644
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ b/tests/docker/dockerfiles/ubuntu2004.docker
@@ -136,8 +136,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 
-RUN pip3 install \
-         meson==0.56.0
+RUN pip3 install meson==0.56.0
 
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci
index 6dd9b6fab1..f83b916d5e 160000
--- a/tests/lcitool/libvirt-ci
+++ b/tests/lcitool/libvirt-ci
@@ -1 +1 @@
-Subproject commit 6dd9b6fab1fe081b16bc975485d7a02c81ba5fbe
+Subproject commit f83b916d5efa4bd33fbf4b7ea41bf6d535cc63fb
-- 
2.30.2
Re: [PATCH v2 03/18] tests/lcitool: update to latest version
Posted by Peter Maydell 3 years, 11 months ago 
On Fri, 25 Feb 2022 at 17:36, Alex Bennée <alex.bennee@linaro.org> wrote:
>
> We will need an update shortly for some new images.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Message-Id: <20220211160309.335014-4-alex.bennee@linaro.org>
> ---
>  tests/docker/dockerfiles/opensuse-leap.docker | 3 +--
>  tests/docker/dockerfiles/ubuntu1804.docker    | 3 +--
>  tests/docker/dockerfiles/ubuntu2004.docker    | 3 +--
>  tests/lcitool/libvirt-ci                      | 2 +-
>  4 files changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
> index 1b78d8369a..e1ad9434a3 100644
> --- a/tests/docker/dockerfiles/opensuse-leap.docker
> +++ b/tests/docker/dockerfiles/opensuse-leap.docker
> @@ -127,8 +127,7 @@ RUN zypper update -y && \
>      ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
>      ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
>
> -RUN pip3 install \
> -         meson==0.56.0
> +RUN pip3 install meson==0.56.0

Why are these formatting changes to the dockerfiles in this commit ?

thanks
-- PMM
Re: [PATCH v2 03/18] tests/lcitool: update to latest version
Posted by Alex Bennée 3 years, 11 months ago 
Peter Maydell <peter.maydell@linaro.org> writes:

> On Fri, 25 Feb 2022 at 17:36, Alex Bennée <alex.bennee@linaro.org> wrote:
>>
>> We will need an update shortly for some new images.
>>
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> Message-Id: <20220211160309.335014-4-alex.bennee@linaro.org>
>> ---
>>  tests/docker/dockerfiles/opensuse-leap.docker | 3 +--
>>  tests/docker/dockerfiles/ubuntu1804.docker    | 3 +--
>>  tests/docker/dockerfiles/ubuntu2004.docker    | 3 +--
>>  tests/lcitool/libvirt-ci                      | 2 +-
>>  4 files changed, 4 insertions(+), 7 deletions(-)
>>
>> diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
>> index 1b78d8369a..e1ad9434a3 100644
>> --- a/tests/docker/dockerfiles/opensuse-leap.docker
>> +++ b/tests/docker/dockerfiles/opensuse-leap.docker
>> @@ -127,8 +127,7 @@ RUN zypper update -y && \
>>      ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
>>      ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
>>
>> -RUN pip3 install \
>> -         meson==0.56.0
>> +RUN pip3 install meson==0.56.0
>
> Why are these formatting changes to the dockerfiles in this commit ?

The latest lcitool I assume didn't see the need for the continuation
line. I ran:

  make lcitool-refresh

when I updated.

-- 
Alex Bennée
Re: [PATCH v2 03/18] tests/lcitool: update to latest version
Posted by Peter Maydell 3 years, 11 months ago 
On Mon, 28 Feb 2022 at 16:46, Alex Bennée <alex.bennee@linaro.org> wrote:
>
>
> Peter Maydell <peter.maydell@linaro.org> writes:
>
> > On Fri, 25 Feb 2022 at 17:36, Alex Bennée <alex.bennee@linaro.org> wrote:
> >>
> >> We will need an update shortly for some new images.
> >>
> >> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> >> Message-Id: <20220211160309.335014-4-alex.bennee@linaro.org>
> >> ---
> >>  tests/docker/dockerfiles/opensuse-leap.docker | 3 +--
> >>  tests/docker/dockerfiles/ubuntu1804.docker    | 3 +--
> >>  tests/docker/dockerfiles/ubuntu2004.docker    | 3 +--
> >>  tests/lcitool/libvirt-ci                      | 2 +-
> >>  4 files changed, 4 insertions(+), 7 deletions(-)
> >>
> >> diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
> >> index 1b78d8369a..e1ad9434a3 100644
> >> --- a/tests/docker/dockerfiles/opensuse-leap.docker
> >> +++ b/tests/docker/dockerfiles/opensuse-leap.docker
> >> @@ -127,8 +127,7 @@ RUN zypper update -y && \
> >>      ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
> >>      ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
> >>
> >> -RUN pip3 install \
> >> -         meson==0.56.0
> >> +RUN pip3 install meson==0.56.0
> >
> > Why are these formatting changes to the dockerfiles in this commit ?
>
> The latest lcitool I assume didn't see the need for the continuation
> line. I ran:
>
>   make lcitool-refresh
>
> when I updated.

Oh, I see. If you put something in the commit message along
the lines of

"This commit was automatically generated by running 'make lcitool-refresh'"

that will help reviewers, since the default assumption is
generally that changes are hand-written.

thanks
-- PMM

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.