add ninja to dockerfiles, CI configurations and test VMs
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Acked-by: Alex Bennée <alex.bennee@linaro.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
f2f984a3b3
commit
345d7053ca
|
@ -9,7 +9,7 @@ freebsd_12_task:
|
||||||
install_script:
|
install_script:
|
||||||
- ASSUME_ALWAYS_YES=yes pkg bootstrap -f ;
|
- ASSUME_ALWAYS_YES=yes pkg bootstrap -f ;
|
||||||
- pkg install -y bash curl cyrus-sasl git glib gmake gnutls gsed
|
- 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:
|
script:
|
||||||
- mkdir build
|
- mkdir build
|
||||||
- cd build
|
- cd build
|
||||||
|
@ -21,7 +21,7 @@ macos_task:
|
||||||
osx_instance:
|
osx_instance:
|
||||||
image: catalina-base
|
image: catalina-base
|
||||||
install_script:
|
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:
|
script:
|
||||||
- mkdir build
|
- mkdir build
|
||||||
- cd build
|
- cd build
|
||||||
|
@ -36,7 +36,7 @@ macos_xcode_task:
|
||||||
# this is an alias for the latest Xcode
|
# this is an alias for the latest Xcode
|
||||||
image: catalina-xcode
|
image: catalina-xcode
|
||||||
install_script:
|
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:
|
script:
|
||||||
- mkdir build
|
- mkdir build
|
||||||
- cd build
|
- cd build
|
||||||
|
|
13
.travis.yml
13
.travis.yml
|
@ -49,6 +49,7 @@ addons:
|
||||||
- libvdeplug-dev
|
- libvdeplug-dev
|
||||||
- libvte-2.91-dev
|
- libvte-2.91-dev
|
||||||
- libzstd-dev
|
- libzstd-dev
|
||||||
|
- ninja-build
|
||||||
- sparse
|
- sparse
|
||||||
- uuid-dev
|
- uuid-dev
|
||||||
- gcovr
|
- gcovr
|
||||||
|
@ -177,6 +178,7 @@ jobs:
|
||||||
addons:
|
addons:
|
||||||
apt:
|
apt:
|
||||||
packages:
|
packages:
|
||||||
|
- ninja-build
|
||||||
- python3-sphinx
|
- python3-sphinx
|
||||||
- perl
|
- perl
|
||||||
|
|
||||||
|
@ -211,6 +213,10 @@ jobs:
|
||||||
# gprof/gcov are GCC features
|
# gprof/gcov are GCC features
|
||||||
- name: "GCC gprof/gcov"
|
- name: "GCC gprof/gcov"
|
||||||
dist: bionic
|
dist: bionic
|
||||||
|
addons:
|
||||||
|
apt:
|
||||||
|
packages:
|
||||||
|
- ninja-build
|
||||||
env:
|
env:
|
||||||
- CONFIG="--enable-gprof --enable-gcov --disable-libssh
|
- CONFIG="--enable-gprof --enable-gcov --disable-libssh
|
||||||
--target-list=${MAIN_SOFTMMU_TARGETS}"
|
--target-list=${MAIN_SOFTMMU_TARGETS}"
|
||||||
|
@ -281,6 +287,7 @@ jobs:
|
||||||
- liburcu-dev
|
- liburcu-dev
|
||||||
- libusb-1.0-0-dev
|
- libusb-1.0-0-dev
|
||||||
- libvte-2.91-dev
|
- libvte-2.91-dev
|
||||||
|
- ninja-build
|
||||||
- sparse
|
- sparse
|
||||||
- uuid-dev
|
- uuid-dev
|
||||||
language: generic
|
language: generic
|
||||||
|
@ -346,6 +353,7 @@ jobs:
|
||||||
- libusb-1.0-0-dev
|
- libusb-1.0-0-dev
|
||||||
- libvdeplug-dev
|
- libvdeplug-dev
|
||||||
- libvte-2.91-dev
|
- libvte-2.91-dev
|
||||||
|
- ninja-build
|
||||||
# Tests dependencies
|
# Tests dependencies
|
||||||
- genisoimage
|
- genisoimage
|
||||||
env:
|
env:
|
||||||
|
@ -379,6 +387,7 @@ jobs:
|
||||||
- libusb-1.0-0-dev
|
- libusb-1.0-0-dev
|
||||||
- libvdeplug-dev
|
- libvdeplug-dev
|
||||||
- libvte-2.91-dev
|
- libvte-2.91-dev
|
||||||
|
- ninja-build
|
||||||
# Tests dependencies
|
# Tests dependencies
|
||||||
- genisoimage
|
- genisoimage
|
||||||
env:
|
env:
|
||||||
|
@ -411,6 +420,7 @@ jobs:
|
||||||
- libusb-1.0-0-dev
|
- libusb-1.0-0-dev
|
||||||
- libvdeplug-dev
|
- libvdeplug-dev
|
||||||
- libvte-2.91-dev
|
- libvte-2.91-dev
|
||||||
|
- ninja-build
|
||||||
# Tests dependencies
|
# Tests dependencies
|
||||||
- genisoimage
|
- genisoimage
|
||||||
env:
|
env:
|
||||||
|
@ -450,6 +460,7 @@ jobs:
|
||||||
- libzstd-dev
|
- libzstd-dev
|
||||||
- nettle-dev
|
- nettle-dev
|
||||||
- xfslibs-dev
|
- xfslibs-dev
|
||||||
|
- ninja-build
|
||||||
# Tests dependencies
|
# Tests dependencies
|
||||||
- genisoimage
|
- genisoimage
|
||||||
env:
|
env:
|
||||||
|
@ -463,6 +474,7 @@ jobs:
|
||||||
apt_packages:
|
apt_packages:
|
||||||
- libgcrypt20-dev
|
- libgcrypt20-dev
|
||||||
- libgnutls28-dev
|
- libgnutls28-dev
|
||||||
|
- ninja-build
|
||||||
env:
|
env:
|
||||||
- CONFIG="--disable-containers --disable-system"
|
- CONFIG="--disable-containers --disable-system"
|
||||||
|
|
||||||
|
@ -493,6 +505,7 @@ jobs:
|
||||||
- libusb-1.0-0-dev
|
- libusb-1.0-0-dev
|
||||||
- libvdeplug-dev
|
- libvdeplug-dev
|
||||||
- libvte-2.91-dev
|
- libvte-2.91-dev
|
||||||
|
- ninja-build
|
||||||
env:
|
env:
|
||||||
- TEST_CMD="make check-unit"
|
- TEST_CMD="make check-unit"
|
||||||
- CONFIG="--disable-containers --disable-tcg --enable-kvm
|
- CONFIG="--disable-containers --disable-tcg --enable-kvm
|
||||||
|
|
|
@ -27,6 +27,7 @@ ENV PACKAGES \
|
||||||
mesa-libEGL-devel \
|
mesa-libEGL-devel \
|
||||||
mesa-libgbm-devel \
|
mesa-libgbm-devel \
|
||||||
nettle-devel \
|
nettle-devel \
|
||||||
|
ninja-build \
|
||||||
perl-Test-Harness \
|
perl-Test-Harness \
|
||||||
pixman-devel \
|
pixman-devel \
|
||||||
python3 \
|
python3 \
|
||||||
|
|
|
@ -19,6 +19,7 @@ ENV PACKAGES \
|
||||||
make \
|
make \
|
||||||
mesa-libEGL-devel \
|
mesa-libEGL-devel \
|
||||||
nettle-devel \
|
nettle-devel \
|
||||||
|
ninja-build \
|
||||||
perl-Test-Harness \
|
perl-Test-Harness \
|
||||||
pixman-devel \
|
pixman-devel \
|
||||||
python36 \
|
python36 \
|
||||||
|
|
|
@ -26,6 +26,7 @@ RUN apt update && \
|
||||||
gettext \
|
gettext \
|
||||||
git \
|
git \
|
||||||
libncurses5-dev \
|
libncurses5-dev \
|
||||||
|
ninja-build \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
psmisc \
|
psmisc \
|
||||||
python3 \
|
python3 \
|
||||||
|
|
|
@ -75,6 +75,7 @@ ENV PACKAGES \
|
||||||
mingw64-SDL2 \
|
mingw64-SDL2 \
|
||||||
ncurses-devel \
|
ncurses-devel \
|
||||||
nettle-devel \
|
nettle-devel \
|
||||||
|
ninja-build \
|
||||||
nss-devel \
|
nss-devel \
|
||||||
numactl-devel \
|
numactl-devel \
|
||||||
perl \
|
perl \
|
||||||
|
|
|
@ -9,7 +9,7 @@ ENV LC_ALL en_US.UTF-8
|
||||||
RUN sed -i "s/# deb-src/deb-src/" /etc/apt/sources.list
|
RUN sed -i "s/# deb-src/deb-src/" /etc/apt/sources.list
|
||||||
RUN apt-get update
|
RUN apt-get update
|
||||||
RUN apt-get -y build-dep qemu
|
RUN apt-get -y build-dep qemu
|
||||||
RUN apt-get -y install device-tree-compiler python3 python3-yaml dh-autoreconf gdb strace lsof net-tools gcovr
|
RUN apt-get -y install device-tree-compiler python3 python3-yaml dh-autoreconf gdb strace lsof net-tools gcovr ninja-build
|
||||||
# Travis tools require PhantomJS / Neo4j / Maven accessible
|
# Travis tools require PhantomJS / Neo4j / Maven accessible
|
||||||
# in their PATH (QEMU build won't access them).
|
# in their PATH (QEMU build won't access them).
|
||||||
ENV PATH /usr/local/phantomjs/bin:/usr/local/phantomjs:/usr/local/neo4j-3.2.7/bin:/usr/local/maven-3.5.2/bin:/usr/local/cmake-3.9.2/bin:/usr/local/clang-5.0.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
|
ENV PATH /usr/local/phantomjs/bin:/usr/local/phantomjs:/usr/local/neo4j-3.2.7/bin:/usr/local/maven-3.5.2/bin:/usr/local/cmake-3.9.2/bin:/usr/local/clang-5.0.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
|
||||||
|
|
|
@ -60,6 +60,7 @@ ENV PACKAGES \
|
||||||
libxen-dev \
|
libxen-dev \
|
||||||
libzstd-dev \
|
libzstd-dev \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
python3-yaml \
|
python3-yaml \
|
||||||
python3-sphinx \
|
python3-sphinx \
|
||||||
sparse \
|
sparse \
|
||||||
|
|
|
@ -48,6 +48,7 @@ ENV PACKAGES \
|
||||||
make \
|
make \
|
||||||
python3-yaml \
|
python3-yaml \
|
||||||
python3-sphinx \
|
python3-sphinx \
|
||||||
|
ninja-build \
|
||||||
sparse \
|
sparse \
|
||||||
xfslibs-dev
|
xfslibs-dev
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
|
|
|
@ -47,6 +47,7 @@ ENV PACKAGES flex bison \
|
||||||
libxen-dev \
|
libxen-dev \
|
||||||
libzstd-dev \
|
libzstd-dev \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
python3-numpy \
|
python3-numpy \
|
||||||
python3-opencv \
|
python3-opencv \
|
||||||
python3-pil \
|
python3-pil \
|
||||||
|
|
|
@ -42,7 +42,7 @@ class CentosVM(basevm.BaseVM):
|
||||||
self.wait_ssh()
|
self.wait_ssh()
|
||||||
self.ssh_root_check("touch /etc/cloud/cloud-init.disabled")
|
self.ssh_root_check("touch /etc/cloud/cloud-init.disabled")
|
||||||
self.ssh_root_check("yum update -y")
|
self.ssh_root_check("yum update -y")
|
||||||
self.ssh_root_check("yum install -y docker make git python3")
|
self.ssh_root_check("yum install -y docker make ninja-build git python3")
|
||||||
self.ssh_root_check("systemctl enable docker")
|
self.ssh_root_check("systemctl enable docker")
|
||||||
self.ssh_root("poweroff")
|
self.ssh_root("poweroff")
|
||||||
self.wait()
|
self.wait()
|
||||||
|
|
|
@ -23,7 +23,7 @@ import aarch64vm
|
||||||
DEFAULT_CONFIG = {
|
DEFAULT_CONFIG = {
|
||||||
'cpu' : "max",
|
'cpu' : "max",
|
||||||
'machine' : "virt,gic-version=max",
|
'machine' : "virt,gic-version=max",
|
||||||
'install_cmds' : "yum install -y make git python3 gcc gcc-c++ flex bison, "\
|
'install_cmds' : "yum install -y make ninja-build git python3 gcc gcc-c++ flex bison, "\
|
||||||
"yum install -y glib2-devel pixman-devel zlib-devel, "\
|
"yum install -y glib2-devel pixman-devel zlib-devel, "\
|
||||||
"yum install -y perl-Test-Harness, "\
|
"yum install -y perl-Test-Harness, "\
|
||||||
"alternatives --set python /usr/bin/python3, "\
|
"alternatives --set python /usr/bin/python3, "\
|
||||||
|
|
|
@ -32,7 +32,7 @@ class FedoraVM(basevm.BaseVM):
|
||||||
pkgs = [
|
pkgs = [
|
||||||
# tools
|
# tools
|
||||||
'git-core',
|
'git-core',
|
||||||
'gcc', 'binutils', 'make',
|
'gcc', 'binutils', 'make', 'ninja-build',
|
||||||
|
|
||||||
# perl
|
# perl
|
||||||
'perl-Test-Harness',
|
'perl-Test-Harness',
|
||||||
|
|
|
@ -34,6 +34,7 @@ class FreeBSDVM(basevm.BaseVM):
|
||||||
"bzip2",
|
"bzip2",
|
||||||
"python37",
|
"python37",
|
||||||
"py37-setuptools",
|
"py37-setuptools",
|
||||||
|
"ninja",
|
||||||
|
|
||||||
# gnu tools
|
# gnu tools
|
||||||
"bash",
|
"bash",
|
||||||
|
|
|
@ -32,6 +32,7 @@ class NetBSDVM(basevm.BaseVM):
|
||||||
"xz",
|
"xz",
|
||||||
"python37",
|
"python37",
|
||||||
"py37-setuptools",
|
"py37-setuptools",
|
||||||
|
"ninja-build",
|
||||||
|
|
||||||
# gnu tools
|
# gnu tools
|
||||||
"bash",
|
"bash",
|
||||||
|
|
|
@ -31,6 +31,7 @@ class OpenBSDVM(basevm.BaseVM):
|
||||||
"pkgconf",
|
"pkgconf",
|
||||||
"bzip2", "xz",
|
"bzip2", "xz",
|
||||||
"py3-setuptools",
|
"py3-setuptools",
|
||||||
|
"ninja",
|
||||||
|
|
||||||
# gnu tools
|
# gnu tools
|
||||||
"bash",
|
"bash",
|
||||||
|
|
|
@ -22,7 +22,7 @@ DEFAULT_CONFIG = {
|
||||||
'machine' : "virt,gic-version=3",
|
'machine' : "virt,gic-version=3",
|
||||||
'install_cmds' : "apt-get update,"\
|
'install_cmds' : "apt-get update,"\
|
||||||
"apt-get build-dep -y --arch-only qemu,"\
|
"apt-get build-dep -y --arch-only qemu,"\
|
||||||
"apt-get install -y libfdt-dev pkg-config language-pack-en",
|
"apt-get install -y libfdt-dev pkg-config language-pack-en ninja-build",
|
||||||
# We increase beyond the default time since during boot
|
# We increase beyond the default time since during boot
|
||||||
# it can take some time (many seconds) to log into the VM
|
# it can take some time (many seconds) to log into the VM
|
||||||
# especially using softmmu.
|
# especially using softmmu.
|
||||||
|
|
|
@ -18,7 +18,7 @@ import ubuntuvm
|
||||||
DEFAULT_CONFIG = {
|
DEFAULT_CONFIG = {
|
||||||
'install_cmds' : "apt-get update,"\
|
'install_cmds' : "apt-get update,"\
|
||||||
"apt-get build-dep -y qemu,"\
|
"apt-get build-dep -y qemu,"\
|
||||||
"apt-get install -y libfdt-dev language-pack-en",
|
"apt-get install -y libfdt-dev language-pack-en ninja-build",
|
||||||
}
|
}
|
||||||
|
|
||||||
class UbuntuX86VM(ubuntuvm.UbuntuVM):
|
class UbuntuX86VM(ubuntuvm.UbuntuVM):
|
||||||
|
|
Loading…
Reference in New Issue