aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2019-04-23 12:59:36 +0200
committerThomas Huth <thuth@redhat.com>2019-05-21 10:12:47 +0200
commitdb2b95d56434bb4afcd979fe2f585bfe5acdf206 (patch)
treee4634dba5f51999c6024f9712a3d327d72f332ca
parentf3d07ce8f449986e9a5c30f2a9f124e2ad8b7c22 (diff)
cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD
We are going to enable the qemu-iotests during "make check" again, and for running the iotests, we need bash and gnu-sed. Reviewed-by: Li-Wen Hsu <lwhsu@freebsd.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> Message-Id: <20190502084506.8009-5-thuth@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
-rw-r--r--.cirrus.yml4
-rw-r--r--.travis.yml1
2 files changed, 3 insertions, 2 deletions
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 66448d99d6..6fd89b3d91 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