[PULL 08/22] add ninja to dockerfiles, CI configurations and test VMs

2020-10-17 Thread Paolo Bonzini 
Reviewed-by: Daniel P. Berrangé 
Acked-by: Alex Bennée 
Signed-off-by: Paolo Bonzini 
---
 .cirrus.yml|  6 +++---
 .travis.yml| 13 +
 tests/docker/dockerfiles/centos7.docker|  1 +
 tests/docker/dockerfiles/centos8.docker|  1 +
 tests/docker/dockerfiles/debian10.docker   |  1 +
 tests/docker/dockerfiles/fedora.docker |  1 +
 tests/docker/dockerfiles/travis.docker |  2 +-
 tests/docker/dockerfiles/ubuntu.docker |  1 +
 tests/docker/dockerfiles/ubuntu1804.docker |  1 +
 tests/docker/dockerfiles/ubuntu2004.docker |  1 +
 tests/vm/centos|  2 +-
 tests/vm/centos.aarch64|  2 +-
 tests/vm/fedora|  2 +-
 tests/vm/freebsd   |  1 +
 tests/vm/netbsd|  1 +
 tests/vm/openbsd   |  1 +
 tests/vm/ubuntu.aarch64|  2 +-
 tests/vm/ubuntu.i386   |  2 +-
 18 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 0f46cb5eaf..396888fbd3 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -9,7 +9,7 @@ freebsd_12_task:
   install_script:
 - ASSUME_ALWAYS_YES=yes pkg bootstrap -f ;
 - pkg install -y bash curl cyrus-sasl git glib gmake gnutls gsed
-  nettle perl5 pixman pkgconf png usbredir
+  nettle perl5 pixman pkgconf png usbredir ninja
   script:
 - mkdir build
 - cd build
@@ -21,7 +21,7 @@ macos_task:
   osx_instance:
 image: catalina-base
   install_script:
-- brew install pkg-config python gnu-sed glib pixman make sdl2 bash
+- brew install pkg-config python gnu-sed glib pixman make sdl2 bash ninja
   script:
 - mkdir build
 - cd build
@@ -36,7 +36,7 @@ macos_xcode_task:
 # this is an alias for the latest Xcode
 image: catalina-xcode
   install_script:
-- brew install pkg-config gnu-sed glib pixman make sdl2 bash
+- brew install pkg-config gnu-sed glib pixman make sdl2 bash ninja
   script:
 - mkdir build
 - cd build
diff --git a/.travis.yml b/.travis.yml
index 1054ec5d29..d7bfbb8bfe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,6 +49,7 @@ addons:
   - libvdeplug-dev
   - libvte-2.91-dev
   - libzstd-dev
+  - ninja-build
   - sparse
   - uuid-dev
   - gcovr
@@ -177,6 +178,7 @@ jobs:
   addons:
 apt:
   packages:
+- ninja-build
 - python3-sphinx
 - perl
 
@@ -211,6 +213,10 @@ jobs:
 # gprof/gcov are GCC features
 - name: "GCC gprof/gcov"
   dist: bionic
+  addons:
+apt:
+  packages:
+- ninja-build
   env:
 - CONFIG="--enable-gprof --enable-gcov --disable-libssh
   --target-list=${MAIN_SOFTMMU_TARGETS}"
@@ -281,6 +287,7 @@ jobs:
 - liburcu-dev
 - libusb-1.0-0-dev
 - libvte-2.91-dev
+- ninja-build
 - sparse
 - uuid-dev
   language: generic
@@ -346,6 +353,7 @@ jobs:
   - libusb-1.0-0-dev
   - libvdeplug-dev
   - libvte-2.91-dev
+  - ninja-build
   # Tests dependencies
   - genisoimage
   env:
@@ -379,6 +387,7 @@ jobs:
   - libusb-1.0-0-dev
   - libvdeplug-dev
   - libvte-2.91-dev
+  - ninja-build
   # Tests dependencies
   - genisoimage
   env:
@@ -411,6 +420,7 @@ jobs:
   - libusb-1.0-0-dev
   - libvdeplug-dev
   - libvte-2.91-dev
+  - ninja-build
   # Tests dependencies
   - genisoimage
   env:
@@ -450,6 +460,7 @@ jobs:
   - libzstd-dev
   - nettle-dev
   - xfslibs-dev
+  - ninja-build
   # Tests dependencies
   - genisoimage
   env:
@@ -463,6 +474,7 @@ jobs:
 apt_packages:
   - libgcrypt20-dev
   - libgnutls28-dev
+  - ninja-build
   env:
 - CONFIG="--disable-containers --disable-system"
 
@@ -493,6 +505,7 @@ jobs:
   - libusb-1.0-0-dev
   - libvdeplug-dev
   - libvte-2.91-dev
+  - ninja-build
   env:
 - TEST_CMD="make check-unit"
 - CONFIG="--disable-containers --disable-tcg --enable-kvm
diff --git a/tests/docker/dockerfiles/centos7.docker 
b/tests/docker/dockerfiles/centos7.docker
index 4623bf..8b273725ee 100644
--- a/tests/docker/dockerfiles/centos7.docker
+++ b/tests/docker/dockerfiles/centos7.docker
@@ -27,6 +27,7 @@ ENV PACKAGES \
 mesa-libEGL-devel \
 mesa-libgbm-devel \
 nettle-devel \
+ninja-build \
 perl-Test-Harness \
 pixman-devel \
 python3 \
diff --git a/tests/docker/dockerfiles/centos8.docker 
b/tests/docker/dockerfiles/centos8.docker
index e29e9657fb..585dfad9be 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@

[PULL 08/22] add ninja to dockerfiles, CI configurations and test VMs

2020-10-16 Thread Paolo Bonzini 
Reviewed-by: Daniel P. Berrangé 
Acked-by: Alex Bennée 
Signed-off-by: Paolo Bonzini 
---
 .cirrus.yml|  6 +++---
 .travis.yml| 13 +
 tests/docker/dockerfiles/centos7.docker|  1 +
 tests/docker/dockerfiles/centos8.docker|  1 +
 tests/docker/dockerfiles/debian10.docker   |  1 +
 tests/docker/dockerfiles/fedora.docker |  1 +
 tests/docker/dockerfiles/travis.docker |  2 +-
 tests/docker/dockerfiles/ubuntu.docker |  1 +
 tests/docker/dockerfiles/ubuntu1804.docker |  1 +
 tests/docker/dockerfiles/ubuntu2004.docker |  1 +
 tests/vm/centos|  2 +-
 tests/vm/centos.aarch64|  2 +-
 tests/vm/fedora|  2 +-
 tests/vm/freebsd   |  1 +
 tests/vm/netbsd|  1 +
 tests/vm/openbsd   |  1 +
 tests/vm/ubuntu.aarch64|  2 +-
 tests/vm/ubuntu.i386   |  2 +-
 18 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 0f46cb5eaf..396888fbd3 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -9,7 +9,7 @@ freebsd_12_task:
   install_script:
 - ASSUME_ALWAYS_YES=yes pkg bootstrap -f ;
 - pkg install -y bash curl cyrus-sasl git glib gmake gnutls gsed
-  nettle perl5 pixman pkgconf png usbredir
+  nettle perl5 pixman pkgconf png usbredir ninja
   script:
 - mkdir build
 - cd build
@@ -21,7 +21,7 @@ macos_task:
   osx_instance:
 image: catalina-base
   install_script:
-- brew install pkg-config python gnu-sed glib pixman make sdl2 bash
+- brew install pkg-config python gnu-sed glib pixman make sdl2 bash ninja
   script:
 - mkdir build
 - cd build
@@ -36,7 +36,7 @@ macos_xcode_task:
 # this is an alias for the latest Xcode
 image: catalina-xcode
   install_script:
-- brew install pkg-config gnu-sed glib pixman make sdl2 bash
+- brew install pkg-config gnu-sed glib pixman make sdl2 bash ninja
   script:
 - mkdir build
 - cd build
diff --git a/.travis.yml b/.travis.yml
index 1054ec5d29..d7bfbb8bfe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,6 +49,7 @@ addons:
   - libvdeplug-dev
   - libvte-2.91-dev
   - libzstd-dev
+  - ninja-build
   - sparse
   - uuid-dev
   - gcovr
@@ -177,6 +178,7 @@ jobs:
   addons:
 apt:
   packages:
+- ninja-build
 - python3-sphinx
 - perl
 
@@ -211,6 +213,10 @@ jobs:
 # gprof/gcov are GCC features
 - name: "GCC gprof/gcov"
   dist: bionic
+  addons:
+apt:
+  packages:
+- ninja-build
   env:
 - CONFIG="--enable-gprof --enable-gcov --disable-libssh
   --target-list=${MAIN_SOFTMMU_TARGETS}"
@@ -281,6 +287,7 @@ jobs:
 - liburcu-dev
 - libusb-1.0-0-dev
 - libvte-2.91-dev
+- ninja-build
 - sparse
 - uuid-dev
   language: generic
@@ -346,6 +353,7 @@ jobs:
   - libusb-1.0-0-dev
   - libvdeplug-dev
   - libvte-2.91-dev
+  - ninja-build
   # Tests dependencies
   - genisoimage
   env:
@@ -379,6 +387,7 @@ jobs:
   - libusb-1.0-0-dev
   - libvdeplug-dev
   - libvte-2.91-dev
+  - ninja-build
   # Tests dependencies
   - genisoimage
   env:
@@ -411,6 +420,7 @@ jobs:
   - libusb-1.0-0-dev
   - libvdeplug-dev
   - libvte-2.91-dev
+  - ninja-build
   # Tests dependencies
   - genisoimage
   env:
@@ -450,6 +460,7 @@ jobs:
   - libzstd-dev
   - nettle-dev
   - xfslibs-dev
+  - ninja-build
   # Tests dependencies
   - genisoimage
   env:
@@ -463,6 +474,7 @@ jobs:
 apt_packages:
   - libgcrypt20-dev
   - libgnutls28-dev
+  - ninja-build
   env:
 - CONFIG="--disable-containers --disable-system"
 
@@ -493,6 +505,7 @@ jobs:
   - libusb-1.0-0-dev
   - libvdeplug-dev
   - libvte-2.91-dev
+  - ninja-build
   env:
 - TEST_CMD="make check-unit"
 - CONFIG="--disable-containers --disable-tcg --enable-kvm
diff --git a/tests/docker/dockerfiles/centos7.docker 
b/tests/docker/dockerfiles/centos7.docker
index 4623bf..8b273725ee 100644
--- a/tests/docker/dockerfiles/centos7.docker
+++ b/tests/docker/dockerfiles/centos7.docker
@@ -27,6 +27,7 @@ ENV PACKAGES \
 mesa-libEGL-devel \
 mesa-libgbm-devel \
 nettle-devel \
+ninja-build \
 perl-Test-Harness \
 pixman-devel \
 python3 \
diff --git a/tests/docker/dockerfiles/centos8.docker 
b/tests/docker/dockerfiles/centos8.docker
index e29e9657fb..585dfad9be 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@