Re: [PULL 06/15] configure: Enable test and libs for zstd

[Juan Quintela]

Peter Maydell <address@hidden> wrote:
> On Fri, 28 Feb 2020 at 09:28, Juan Quintela <address@hidden> wrote:
>>
>> Add it to several build systems to make testing good.
>>
>> Signed-off-by: Juan Quintela <address@hidden>
>> Reviewed-by: Dr. David Alan Gilbert <address@hidden>
>> ---
>>  .gitlab-ci.yml                                |  1 +
>>  .travis.yml                                   |  1 +
>>  configure                                     | 30 +++++++++++++++++++
>>  tests/docker/dockerfiles/centos7.docker       |  3 +-
>>  .../dockerfiles/fedora-i386-cross.docker      |  3 +-
>>  tests/docker/dockerfiles/fedora.docker        |  3 +-
>>  tests/docker/dockerfiles/ubuntu.docker        |  1 +
>>  tests/docker/dockerfiles/ubuntu1804.docker    |  1 +
>>  tests/vm/fedora                               |  5 +++-
>>  tests/vm/freebsd                              |  3 ++
>>  tests/vm/netbsd                               |  3 ++
>>  tests/vm/openbsd                              |  3 ++
>>  12 files changed, 53 insertions(+), 4 deletions(-)
>
> Hi; this patch changes some .docker files, but it has
> put the new line at the bottom of each package list,
> rather than at the correct point in the alphabetical
> order that the lists are in, for these 3 fedora/centos ones:

ok.

I mill send a patch for that.

Sorry, Juan.


>
>> diff --git a/tests/docker/dockerfiles/centos7.docker 
>> b/tests/docker/dockerfiles/centos7.docker
>> index 562d65be9e..cdd72de7eb 100644
>> --- a/tests/docker/dockerfiles/centos7.docker
>> +++ b/tests/docker/dockerfiles/centos7.docker
>> @@ -33,6 +33,7 @@ ENV PACKAGES \
>>      tar \
>>      vte-devel \
>>      xen-devel \
>> -    zlib-devel
>> +    zlib-devel \
>> +    libzstd-devel
>>  RUN yum install -y $PACKAGES
>>  RUN rpm -q $PACKAGES | sort > /packages.txt
>> diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker 
>> b/tests/docker/dockerfiles/fedora-i386-cross.docker
>> index 9106cf9ebe..cd16cd1bfa 100644
>> --- a/tests/docker/dockerfiles/fedora-i386-cross.docker
>> +++ b/tests/docker/dockerfiles/fedora-i386-cross.docker
>> @@ -7,7 +7,8 @@ ENV PACKAGES \
>>      gnutls-devel.i686 \
>>      nettle-devel.i686 \
>>      pixman-devel.i686 \
>> -    zlib-devel.i686
>> +    zlib-devel.i686 \
>> +    libzstd-devel.i686
>>
>>  RUN dnf install -y $PACKAGES
>>  RUN rpm -q $PACKAGES | sort > /packages.txt
>> diff --git a/tests/docker/dockerfiles/fedora.docker 
>> b/tests/docker/dockerfiles/fedora.docker
>> index 987a3c170a..a6522228c0 100644
>> --- a/tests/docker/dockerfiles/fedora.docker
>> +++ b/tests/docker/dockerfiles/fedora.docker
>> @@ -92,7 +92,8 @@ ENV PACKAGES \
>>      vte291-devel \
>>      which \
>>      xen-devel \
>> -    zlib-devel
>> +    zlib-devel \
>> +    libzstd-devel
>>  ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3
>>
>>  RUN dnf install -y $PACKAGES
>
> The ubuntu ones are OK though:
>
>> diff --git a/tests/docker/dockerfiles/ubuntu.docker
>> b/tests/docker/dockerfiles/ubuntu.docker
>> index 4177f33691..b6c7b41ddd 100644
>> --- a/tests/docker/dockerfiles/ubuntu.docker
>> +++ b/tests/docker/dockerfiles/ubuntu.docker
>> @@ -58,6 +58,7 @@ ENV PACKAGES flex bison \
>>      libvdeplug-dev \
>>      libvte-2.91-dev \
>>      libxen-dev \
>> +    libzstd-dev \
>>      make \
>>      python3-yaml \
>>      python3-sphinx \
>> diff --git a/tests/docker/dockerfiles/ubuntu1804.docker
>> b/tests/docker/dockerfiles/ubuntu1804.docker
>> index 0766f94cf4..1efedeef99 100644
>> --- a/tests/docker/dockerfiles/ubuntu1804.docker
>> +++ b/tests/docker/dockerfiles/ubuntu1804.docker
>> @@ -44,6 +44,7 @@ ENV PACKAGES flex bison \
>>      libvdeplug-dev \
>>      libvte-2.91-dev \
>>      libxen-dev \
>> +    libzstd-dev \
>>      make \
>>      python3-yaml \
>>      python3-sphinx \
>
>
> Could somebody send a patch that fixes up the ordering,
> please?
>
> thanks
> -- PMM