From nobody Sat Apr 27 17:43:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1506080635808311.50722622495425; Fri, 22 Sep 2017 04:43:55 -0700 (PDT) Received: from localhost ([::1]:58150 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvMN6-0007Yh-OO for importer@patchew.org; Fri, 22 Sep 2017 07:43:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41792) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvMM8-00073H-6I for qemu-devel@nongnu.org; Fri, 22 Sep 2017 07:42:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dvMM4-0007oG-Vx for qemu-devel@nongnu.org; Fri, 22 Sep 2017 07:42:52 -0400 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:32836) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dvMM4-0007nt-Ml for qemu-devel@nongnu.org; Fri, 22 Sep 2017 07:42:48 -0400 Received: by mail-wr0-x242.google.com with SMTP id b9so513580wra.0 for ; Fri, 22 Sep 2017 04:42:48 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-246-117.clienti.tiscali.it. [78.12.246.117]) by smtp.gmail.com with ESMTPSA id o11sm3030541wrg.5.2017.09.22.04.42.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Sep 2017 04:42:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=L10SoqWeJWBv/Uzp6kgYXLn79DdZarTqeCbORW6b86c=; b=VpkcsGxXOzln7W9aRbRWLj/lyFiTtVUt45vZTQaXOMbqqPIzlHeNOGfbSZBEVdIjC4 YpXYIUf1CJElOO7VX+Q/8uol3DfnezXttEAsSMEo3uzKRx3UpFNK8V2sB5P/i+ZE/eSq dwhLMpm43cn74gZp0dsXUrNe0fb2S14+xZg3IbhMv0NpZ7Pe97CdJ/FsfB5ggFFF/lYs 7YuAZ+txWvuOrzswFOWQPfeppK7lHGmYfCOJgWU1+j/td+rlzpZ5zjV9H7kt2KtAxDmF Y67oJUbD2hHP0s324oO5p5pKcPJUA/df4HjTKnvEsglDbkTBN0Gb8ADDvK3SWarNlUtR waqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=L10SoqWeJWBv/Uzp6kgYXLn79DdZarTqeCbORW6b86c=; b=RG8+/PYktbgDv7u7opuLYbN8u5s6NHIq7MdIUkD4lHkHatfZDlAytpiFl1Gz8/Ys7N YWx45VoI/wYXkd9BzLP/6ppre2P/ggqXKiGo8hAStfHYIN3YUCK8ufv2ma6ihBzEcFf6 XsM34IyyqxkF4ZEsZtcwH7p11f1TL6Ak33/kj90b3Jy70mBd7JeXlzvUn3m3jG79xdz+ V9IA7hC74ujiDZ9zTTuqvpze4jzorqTCHkXWeLxH4bcWcujzjuXAkFbPlUb/mPrzIrRQ fnkHLvtCofe6rjPQYvTVlFKJTSeJGbsfA/vkLijSpmFLiPeDwTyKmZoIPkU7AvhcvJin zEig== X-Gm-Message-State: AHPjjUjq4SgcQQvAhHkLaxd8s4emkPym84myxgGR9vJRtllPxafHQYsk 0nrQR3CruLdRF7UIt1AjRF6PoT6K X-Google-Smtp-Source: AOwi7QAMu9UR7qob1mQPElv33ALFFJ/0rE1xaeM9bXWSXYw4k37CLqFfd5SwPPcjUYiayBc/PfmLvw== X-Received: by 10.223.170.155 with SMTP id h27mr4593226wrc.95.1506080567128; Fri, 22 Sep 2017 04:42:47 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 22 Sep 2017 13:42:43 +0200 Message-Id: <1506080563-41084-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::242 Subject: [Qemu-devel] [PATCH] docker: add installation to build tests X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: famz@redhat.com, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Basic test that "make install" works; this requires msgfmt so add gettext to the packages. Drop ccache on Fedora, because it fails on RHEL 7.4, it is not used by any other distro and it is not particularly useful on throwaway containers. Signed-off-by: Paolo Bonzini --- tests/docker/common.rc | 8 ++++++++ tests/docker/dockerfiles/centos6.docker | 1 + tests/docker/dockerfiles/centos7.docker | 1 + tests/docker/dockerfiles/debian-ports.docker | 1 + tests/docker/dockerfiles/debian8.docker | 1 + tests/docker/dockerfiles/debian9.docker | 1 + tests/docker/dockerfiles/fedora.docker | 2 +- tests/docker/dockerfiles/min-glib.docker | 2 +- tests/docker/dockerfiles/ubuntu.docker | 2 +- tests/docker/test-build | 1 + tests/docker/test-clang | 1 + tests/docker/test-full | 1 + tests/docker/test-mingw | 1 + tests/docker/test-quick | 1 + 14 files changed, 21 insertions(+), 3 deletions(-) diff --git a/tests/docker/common.rc b/tests/docker/common.rc index 6865689..1522aab 100755 --- a/tests/docker/common.rc +++ b/tests/docker/common.rc @@ -36,3 +36,11 @@ build_qemu() $QEMU_SRC/configure $config_opts make $MAKEFLAGS } + +install_qemu() +{ + make install $MAKEFLAGS DESTDIR=3D$PWD/=3Ddestdir + ret=3D$? + rm -rf $PWD/=3Ddestdir + return $ret +} diff --git a/tests/docker/dockerfiles/centos6.docker b/tests/docker/dockerf= iles/centos6.docker index f6aae13..ad24319 100644 --- a/tests/docker/dockerfiles/centos6.docker +++ b/tests/docker/dockerfiles/centos6.docker @@ -8,6 +8,7 @@ ENV PACKAGES \ flex \ g++ \ gcc \ + gettext \ git \ glib2-devel \ libepoxy-devel \ diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerf= iles/centos7.docker index 0b59aa2..575de29 100644 --- a/tests/docker/dockerfiles/centos7.docker +++ b/tests/docker/dockerfiles/centos7.docker @@ -9,6 +9,7 @@ ENV PACKAGES \ flex \ g++ \ gcc \ + gettext \ git \ glib2-devel \ libepoxy-devel \ diff --git a/tests/docker/dockerfiles/debian-ports.docker b/tests/docker/do= ckerfiles/debian-ports.docker index fba224f..e05a9a9 100644 --- a/tests/docker/dockerfiles/debian-ports.docker +++ b/tests/docker/dockerfiles/debian-ports.docker @@ -27,6 +27,7 @@ RUN DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ clang \ debian-ports-archive-keyring \ flex \ + gettext \ git \ pkg-config \ psmisc \ diff --git a/tests/docker/dockerfiles/debian8.docker b/tests/docker/dockerf= iles/debian8.docker index 3d09b4b..1bcf2e3 100644 --- a/tests/docker/dockerfiles/debian8.docker +++ b/tests/docker/dockerfiles/debian8.docker @@ -26,6 +26,7 @@ RUN DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ clang \ curl \ flex \ + gettext \ git \ gnupg \ pkg-config \ diff --git a/tests/docker/dockerfiles/debian9.docker b/tests/docker/dockerf= iles/debian9.docker index a450995..154ae2a 100644 --- a/tests/docker/dockerfiles/debian9.docker +++ b/tests/docker/dockerfiles/debian9.docker @@ -22,6 +22,7 @@ RUN DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ ca-certificates \ clang \ flex \ + gettext \ git \ pkg-config \ psmisc \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index 4eaa8ed..dec6b1a 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,6 +1,6 @@ FROM fedora:latest ENV PACKAGES \ - ccache git tar PyYAML sparse flex bison python2 bzip2 hostname \ + gettext git tar PyYAML sparse flex bison python2 bzip2 hostname \ glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \ gcc gcc-c++ clang make perl which bc findutils libaio-devel \ mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL mingw32-pkg-confi= g \ diff --git a/tests/docker/dockerfiles/min-glib.docker b/tests/docker/docker= files/min-glib.docker index 9f542d5..f2eed97 100644 --- a/tests/docker/dockerfiles/min-glib.docker +++ b/tests/docker/dockerfiles/min-glib.docker @@ -1,6 +1,6 @@ FROM centos:6 RUN yum install -y \ - tar git make gcc g++ \ + tar gettext git make gcc g++ \ zlib-devel SDL-devel pixman-devel \ epel-release RUN yum install -y libfdt-devel ccache diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfi= les/ubuntu.docker index a360a05..131668c 100644 --- a/tests/docker/dockerfiles/ubuntu.docker +++ b/tests/docker/dockerfiles/ubuntu.docker @@ -7,7 +7,7 @@ ENV PACKAGES flex bison \ libseccomp-dev libgnutls-dev libssh2-1-dev libspice-server-dev \ libspice-protocol-dev libnss3-dev libfdt-dev \ libgtk-3-dev libvte-2.90-dev libsdl1.2-dev libpng12-dev libpixman-1-de= v \ - git make ccache python-yaml gcc clang sparse + gettext git make ccache python-yaml gcc clang sparse RUN apt-get -y install $PACKAGES RUN dpkg -l $PACKAGES | sort > /packages.txt ENV FEATURES clang pyyaml diff --git a/tests/docker/test-build b/tests/docker/test-build index 031a7d9..22766cf 100755 --- a/tests/docker/test-build +++ b/tests/docker/test-build @@ -18,3 +18,4 @@ cd "$BUILD_DIR" DEF_TARGET_LIST=3D"x86_64-softmmu,aarch64-softmmu" TARGET_LIST=3D${TARGET_LIST:-$DEF_TARGET_LIST} \ build_qemu +install_qemu diff --git a/tests/docker/test-clang b/tests/docker/test-clang index 16485e6..1eb61a3 100755 --- a/tests/docker/test-clang +++ b/tests/docker/test-clang @@ -24,3 +24,4 @@ OPTS=3D"--enable-debug --cxx=3Dclang++ --cc=3Dclang --hos= t-cc=3Dclang" #--extra-cflags=3D-fno-sanitize=3Dfloat-divide-by-zero" build_qemu $OPTS make $MAKEFLAGS check +install_qemu diff --git a/tests/docker/test-full b/tests/docker/test-full index 05f0d49..a0ba90e 100755 --- a/tests/docker/test-full +++ b/tests/docker/test-full @@ -17,3 +17,4 @@ cd "$BUILD_DIR" =20 build_qemu make check $MAKEFLAGS +install_qemu diff --git a/tests/docker/test-mingw b/tests/docker/test-mingw index 2adadcb..39a1da4 100755 --- a/tests/docker/test-mingw +++ b/tests/docker/test-mingw @@ -31,6 +31,7 @@ for prefix in x86_64-w64-mingw32- i686-w64-mingw32-; do --enable-guest-agent \ --with-sdlabi=3D1.2 \ --with-gtkabi=3D2.0 + install_qemu make clean =20 done diff --git a/tests/docker/test-quick b/tests/docker/test-quick index c465dc0..3b7bce6 100755 --- a/tests/docker/test-quick +++ b/tests/docker/test-quick @@ -19,3 +19,4 @@ DEF_TARGET_LIST=3D"x86_64-softmmu,aarch64-softmmu" TARGET_LIST=3D${TARGET_LIST:-$DEF_TARGET_LIST} \ build_qemu make check $MAKEFLAGS +install_qemu --=20 1.8.3.1