Re: [Qemu-devel] [PATCH 4/6] cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD

[Laszlo Ersek]

(+Dan)

On 04/25/19 08:00, Thomas Huth wrote:
> On 24/04/2019 23.29, Wainer dos Santos Moschetta wrote:
>> Hello Thomas,
>>
>> On 04/24/2019 07:37 AM, Thomas Huth wrote:
>>> We are going to enable the qemu-iotests during "make check" again,
>>> and for running the iotests, we need bash and gnu-sed.
>>>
>>> Signed-off-by: Thomas Huth 
>>> ---
>>>   .cirrus.yml | 4 ++--
>>>   .travis.yml | 1 +
>>>   2 files changed, 3 insertions(+), 2 deletions(-)
>>
>> It needs to get the Freebsd image [1] updated too, in order to `make
>> BUILD_TARGET=check vm-build-freebsd` passes. Here it failed with:
>> ---
>> env: bash: No such file or directory
>> gmake: *** [/var/tmp/qemu-test.6OlDFH/tests/Makefile.include:1101:
>> check-tests/qemu-iotests-quick.sh] Error 1
>> gmake: *** Waiting for unfinished jobs
>> ---
>>
>> I'm not sure about the netbsd and openbsd images, they might need bash
>> and gnu-sed as well.
> 
> D'oh! Does anybody know what are the correct steps to update these images?

(1) make the OPENBSD subsystem maintainer care

(2) update 

(3) download the image from download.patchew.org, boot it and update it

(4) upload the image to download.patchew.org

(5) update the "tests/vm/openbsd" script in the QEMU tree in sync
(checksums, commands etc)


I'm fairly sure (1) is necessary; the rest is more or less guesswork on
my part.

Thanks
Laszlo

Re: [Qemu-devel] [PATCH 4/6] cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD

[Thomas Huth]

On 24/04/2019 23.29, Wainer dos Santos Moschetta wrote:
> Hello Thomas,
> 
> On 04/24/2019 07:37 AM, Thomas Huth wrote:
>> We are going to enable the qemu-iotests during "make check" again,
>> and for running the iotests, we need bash and gnu-sed.
>>
>> Signed-off-by: Thomas Huth 
>> ---
>>   .cirrus.yml | 4 ++--
>>   .travis.yml | 1 +
>>   2 files changed, 3 insertions(+), 2 deletions(-)
> 
> It needs to get the Freebsd image [1] updated too, in order to `make
> BUILD_TARGET=check vm-build-freebsd` passes. Here it failed with:
> ---
> env: bash: No such file or directory
> gmake: *** [/var/tmp/qemu-test.6OlDFH/tests/Makefile.include:1101:
> check-tests/qemu-iotests-quick.sh] Error 1
> gmake: *** Waiting for unfinished jobs
> ---
> 
> I'm not sure about the netbsd and openbsd images, they might need bash
> and gnu-sed as well.

D'oh! Does anybody know what are the correct steps to update these images?

 Thomas

Re: [Qemu-devel] [PATCH 4/6] cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD

[Wainer dos Santos Moschetta]

Hello Thomas,

On 04/24/2019 07:37 AM, Thomas Huth wrote:

We are going to enable the qemu-iotests during "make check" again,
and for running the iotests, we need bash and gnu-sed.

Signed-off-by: Thomas Huth 
---
  .cirrus.yml | 4 ++--
  .travis.yml | 1 +
  2 files changed, 3 insertions(+), 2 deletions(-)


It needs to get the Freebsd image [1] updated too, in order to `make 
BUILD_TARGET=check vm-build-freebsd` passes. Here it failed with:

---
env: bash: No such file or directory
gmake: *** [/var/tmp/qemu-test.6OlDFH/tests/Makefile.include:1101: 
check-tests/qemu-iotests-quick.sh] Error 1

gmake: *** Waiting for unfinished jobs
---

I'm not sure about the netbsd and openbsd images, they might need bash 
and gnu-sed as well.


[1] http://download.patchew.org/freebsd-11.1-amd64.img.xz

- Wainer



diff --git a/.cirrus.yml b/.cirrus.yml
index 47ef5bc604..8326a3a4b1 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -7,7 +7,7 @@ freebsd_12_task:
  cpu: 8
  memory: 8G
install_script: pkg install -y
-bison curl cyrus-sasl git glib gmake gnutls
+bash bison curl cyrus-sasl git glib gmake gnutls gsed
  nettle perl5 pixman pkgconf png usbredir
script:
  - mkdir build
@@ -20,7 +20,7 @@ macos_task:
osx_instance:
  image: mojave-base
install_script:
-- brew install pkg-config python glib pixman make sdl2
+- brew install pkg-config python gnu-sed glib pixman make sdl2
script:
  - ./configure --python=/usr/local/bin/python3 || { cat config.log; exit 
1; }
  - gmake -j$(sysctl -n hw.ncpu)
diff --git a/.travis.yml b/.travis.yml
index 2e06aee9d0..ba94644192 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,6 +42,7 @@ addons:
  packages:
- glib
- pixman
+  - gnu-sed
  
  
  # The channel name "irc.oftc.net#qemu" is encrypted against qemu/qemu