From patchwork Mon Jan 14 15:01:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 10762897 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 75D80139A for ; Mon, 14 Jan 2019 15:05:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 66D6728B61 for ; Mon, 14 Jan 2019 15:05:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 64F412908F; Mon, 14 Jan 2019 15:05:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 273FB28B61 for ; Mon, 14 Jan 2019 15:05:21 +0000 (UTC) Received: from localhost ([127.0.0.1]:48365 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3nl-0000nX-8r for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Jan 2019 10:05:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35457) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3kF-0006JG-4D for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj3k9-0005IU-44 for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:43 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:39605) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj3k8-0005FI-SS for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:37 -0500 Received: by mail-wr1-x430.google.com with SMTP id t27so23214365wra.6 for ; Mon, 14 Jan 2019 07:01:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=j1YWKF+cjl3WnlvF9jWwrvHU6PG4fwQ2Nx5MLUxWNzk=; b=ef/jWP19PASaQPahDiWJs2Kn1ttYXR1nJqbY9H2qrSloHx1sMmdhPezKkplCwWE+wr pJ0uaryopel5MQ9z135tqpFs+1US8qdtEuLVHrYjgg2VaFXcJZZX47EjEthPYjUkvRiV VndIS/g/bAobQWtgmWi51I6KNKk6DxgRA4ykw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=j1YWKF+cjl3WnlvF9jWwrvHU6PG4fwQ2Nx5MLUxWNzk=; b=fgjqvvqTpYK8vFD4Way+TQtWEKfsmTOweYMujvcyC9gWVnjJKRkE5t9aybw1SmZq1g +FtoL/69fko8SFvkH8/v7jHH7xPILn5pQJt4lKPTeQSPiebUh1OK0PjaKYQnXbGtIScQ VmdcmkELiDAYLYXMxGFCRg8vztsmTXYFQY3YyF9z7TnGq41Aihk3Y8NdmjlzpElXSB8o +aTLGf9Sbo7OOFi0cA4m83BXO8FXPJtAhcaAH+8XKi1UMpRG01oOVgTdOeL9o7/xURJ2 fWO/k0lBL1Ws9p+ktqJPHCdy4QPWdtVG6K/ZwOXxAPG68hfgTHV3eEtuRt1eQmQJEtWl afRg== X-Gm-Message-State: AJcUukccWmlQ0pRzQOhFOFdacIrdhXja6XweuDvji5J96lSZ25xTULww A6j/sBBbCW8AxNlRP9tyvn06lXF5Aag= X-Google-Smtp-Source: ALg8bN5xWlHWVmMw3FNpIQxQPjRHoaouCykx3qGDh70w6Cr7kXXh+KCZBFcDlJmI4f+b6cBHqT41pQ== X-Received: by 2002:adf:c38e:: with SMTP id p14mr24319252wrf.68.1547478090892; Mon, 14 Jan 2019 07:01:30 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id m193sm30429746wmb.26.2019.01.14.07.01.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jan 2019 07:01:30 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id DC24D3E0865; Mon, 14 Jan 2019 15:01:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 14 Jan 2019 15:01:09 +0000 Message-Id: <20190114150129.1013-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114150129.1013-1-alex.bennee@linaro.org> References: <20190114150129.1013-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::430 Subject: [Qemu-devel] [PULL 01/21] docker: Use stable git tag for virglrenderer 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: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Philippe Mathieu-Daudé Use a stable tag instead of some random commit from mainstream development, to avoid unexpected build failures. This fixes: CC virglrenderer.lo virglrenderer.c: In function 'virgl_has_gl_colorspace': virglrenderer.c:208:11: error: implicit declaration of function 'virgl_has_egl_khr_gl_colorspace' [-Werror=implicit-function-declaration] virgl_has_egl_khr_gl_colorspace(egl_info)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ virglrenderer.c:208:43: error: 'egl_info' undeclared (first use in this function) virgl_has_egl_khr_gl_colorspace(egl_info)); ^~~~~~~~ virglrenderer.c:208:43: note: each undeclared identifier is reported only once for each function it appears in cc1: some warnings being treated as errors As of this commit 'git virglrenderer-0.7.0' is the last stable tag. (virglrenderer commit breaking: fb4f7577f7ef) Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker index 24b113b76f..47a30adbdb 100644 --- a/tests/docker/dockerfiles/debian-amd64.docker +++ b/tests/docker/dockerfiles/debian-amd64.docker @@ -24,7 +24,8 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ libegl1-mesa-dev \ libepoxy-dev \ libgbm-dev -RUN git clone https://anongit.freedesktop.org/git/virglrenderer.git /usr/src/virglrenderer +RUN git clone https://anongit.freedesktop.org/git/virglrenderer.git /usr/src/virglrenderer && \ + cd /usr/src/virglrenderer && git checkout virglrenderer-0.7.0 RUN cd /usr/src/virglrenderer && ./autogen.sh && ./configure --with-glx --disable-tests && make install # netmap From patchwork Mon Jan 14 15:01:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 10762907 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6537E139A for ; Mon, 14 Jan 2019 15:08:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 519812808F for ; Mon, 14 Jan 2019 15:08:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 426EE28178; Mon, 14 Jan 2019 15:08:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E43CA2808F for ; Mon, 14 Jan 2019 15:08:49 +0000 (UTC) Received: from localhost ([127.0.0.1]:49080 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3r7-0005Km-8M for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Jan 2019 10:08:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35448) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3kE-0006Iu-NX for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj3k9-0005IV-41 for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:42 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:33536) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj3k8-0005GA-S4 for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:37 -0500 Received: by mail-wr1-x444.google.com with SMTP id c14so23320190wrr.0 for ; Mon, 14 Jan 2019 07:01:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UvQIiCbjbjNM0+XU/mySxhCcG1P+7mGtisvnYlPEEYQ=; b=dNwwyekU2MGw4+j7V8ht0EfFHq/TYRCtFOs3FOj7yTbM+5FkvohXyN29SoFRSBa2yB zPioTsx+PQLe1Dxh/lYVWT+Hq/U0JXeiv0KReJoJCKuM8Y3+yDKlqJiHaNxLTmhdDwDo jO+X0Vb5M7TJD66ET/mc3T+tuHU6WTVNz9ek0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UvQIiCbjbjNM0+XU/mySxhCcG1P+7mGtisvnYlPEEYQ=; b=FVUl4WHwGhx9qTO/O+RTAHrFy5QmJn4E4Rny48gL7WeQx8v6cqNLak2xRN7HGkSat6 tnC+UfNRAe9KRn0DzRlZDEaKVR9udPY/DDr/cOBx2SEQ967eNVkwwoJUNS9Jhz/VA/04 oYPKi7Ewaxa75X/oWev6aGiVJ6n+R0VAXcKwpmVNoTiTx9/wlUzFoB6EvXprdaVAqi38 iouenIQD9sjVQhxUBWqto86WRSKlSu1m/7Lpmd+8b3fvAwWYNQKxg+C9IBqI/RUzao97 QiiftGllvkegZIqx89xi272Vd2ZwVn1OE/eNx5DCqCK/X53fRhWN9kvi9IfGi0iaDQU8 P7pQ== X-Gm-Message-State: AJcUukf6A+u2pYk34RDJRtrjMV0OQbL/IKn8gJGF05Mzkb5pBwgqDSKq HRBJhN1vTKEFuQvls6gPQvjhtw== X-Google-Smtp-Source: ALg8bN5xzs3LjfIjlp4Np2q6foW8wje85W4dEsbZhwCmNiTGBwOrU5SUzA1N/6UGxpWAJK/IzKRVHg== X-Received: by 2002:a5d:4a8e:: with SMTP id o14mr23571279wrq.159.1547478093000; Mon, 14 Jan 2019 07:01:33 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y12sm20609302wmi.7.2019.01.14.07.01.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jan 2019 07:01:31 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id F09A93E0A8A; Mon, 14 Jan 2019 15:01:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 14 Jan 2019 15:01:10 +0000 Message-Id: <20190114150129.1013-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114150129.1013-1-alex.bennee@linaro.org> References: <20190114150129.1013-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PULL 02/21] tests: run ldconfig after installing extra software 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: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Daniel P. Berrangé The docker file builds and installs software into /usr/local but does not run ldconfig. As a result QEMU links to libvirglrenderer.so, but then crashes in "make check" unable to find the library. Signed-off-by: Daniel P. Berrangé Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker index 47a30adbdb..954fcf9606 100644 --- a/tests/docker/dockerfiles/debian-amd64.docker +++ b/tests/docker/dockerfiles/debian-amd64.docker @@ -36,5 +36,7 @@ RUN git clone https://github.com/luigirizzo/netmap.git /usr/src/netmap RUN cd /usr/src/netmap/LINUX && ./configure --no-drivers --no-apps --kernel-dir=$(ls -d /usr/src/linux-headers-*-amd64) && make install ENV QEMU_CONFIGURE_OPTS --enable-netmap +RUN ldconfig + # gcrypt ENV QEMU_CONFIGURE_OPTS $QEMU_CONFIGURE_OPTS --enable-gcrypt From patchwork Mon Jan 14 15:01:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 10762895 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AC41F184E for ; Mon, 14 Jan 2019 15:03:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9BDD128A0F for ; Mon, 14 Jan 2019 15:03:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 99BBD28A2A; Mon, 14 Jan 2019 15:03:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 564B329066 for ; Mon, 14 Jan 2019 15:03:46 +0000 (UTC) Received: from localhost ([127.0.0.1]:48060 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3mD-0007qq-HV for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Jan 2019 10:03:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3kA-0006ER-61 for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj3k9-0005J1-CD for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:38 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:50885) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj3k9-0005GH-20 for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:37 -0500 Received: by mail-wm1-x332.google.com with SMTP id n190so9261035wmd.0 for ; Mon, 14 Jan 2019 07:01:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9W2W5ypHdbhCljf9vLhBrjOvhq2an8RN5rr7CWhXlC4=; b=g7hGhZIiGE4rbUElbztUwDwt4H0ilSJTiSlEoQfLoIj6FoCpxwIjAHbdB2n1wU+yWS AoJ9sva5A7KnU0rFB7Yv1BOa9ZRAi/gjJhe7WZX8rGni/NDDyDrvy140mP7g3ZPH32dY UjlAO6oB4oVMUqefiCDAZrMF27G3836N3Zur0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9W2W5ypHdbhCljf9vLhBrjOvhq2an8RN5rr7CWhXlC4=; b=K6jUhvj0+dq62U9RgZRI2oNt8jfX+O1w3vAbHwnOefF1g7+3157zii5AdHHwOzOSUz tPsKAyJlWnUqpBFuPMoLkoGsjQPm7Gq7hi+nygrn74zdi/P6/A94HNgYw8NI3QJFfH6B Ko+Xo8rmt8jgSLRkySlq7iHVf+BJo/kU9XKtUGiL1ZZiCVZWyFuj8gZ/I7WNUrZc0tac RlIzF7tjrfLTXcSn3M891aFCbhyjwgFVkz1+oYmfjrb1LG/hO/MhqRRq7ZtLGI1QVgk5 KoG3xVasvyZLWEl2U8mMXve/ktCM7z3PM6cQWkJVNXD4USBTjKyp0hvm7tgzzdt7FYuS hb9A== X-Gm-Message-State: AJcUukfTF4gTIELb3PXTzMNbfBpaUIhHvFoQyGynCv13Qz2vkxTSKXZQ 0PQ0KXGqfkaDRL9o+MdzR+8tfg== X-Google-Smtp-Source: ALg8bN42zHm89r6SFrOrejUJKnJDCFLNnpe6GPMTKMWPwbw2ym3bHldnN3/cINUmrOn9wjZNPeJvHA== X-Received: by 2002:a1c:cbcb:: with SMTP id b194mr11363229wmg.64.1547478093608; Mon, 14 Jan 2019 07:01:33 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id w125sm34928874wmb.45.2019.01.14.07.01.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jan 2019 07:01:31 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 1492F3E0D14; Mon, 14 Jan 2019 15:01:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 14 Jan 2019 15:01:11 +0000 Message-Id: <20190114150129.1013-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114150129.1013-1-alex.bennee@linaro.org> References: <20190114150129.1013-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::332 Subject: [Qemu-devel] [PULL 03/21] tests: remove obsolete 'debian' dockerfile 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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Daniel P. Berrangé The 'debian' dockerfile was deprecated in favour of versioned dockerfiles in July 2017. That is enough time for developers to be warned about the rename. Signed-off-by: Daniel P. Berrangé Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/docker/dockerfiles/debian.docker b/tests/docker/dockerfiles/debian.docker deleted file mode 100644 index fd32e71b79..0000000000 --- a/tests/docker/dockerfiles/debian.docker +++ /dev/null @@ -1,13 +0,0 @@ -# This template is deprecated and was previously based on Jessie on QEMU 2.9. -# Now than Stretch is out, please use qemu:debian8 as base for Jessie, -# and qemu:debian9 for Stretch. -# -FROM qemu:debian9 - -MAINTAINER Philippe Mathieu-Daudé - -RUN for n in $(seq 8); do echo; done && \ - echo "\n\t\tThis image is deprecated." && echo && \ - echo "\tUse 'FROM qemu:debian9' to use the stable Debian Stretch image" && \ - echo "\tor 'FROM qemu:debian8' to use old Debian Jessie." && \ - for n in $(seq 8); do echo; done From patchwork Mon Jan 14 15:01:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 10762911 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C9014139A for ; Mon, 14 Jan 2019 15:10:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B477D28F7D for ; Mon, 14 Jan 2019 15:10:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ADA8029049; Mon, 14 Jan 2019 15:10:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AA91E290F1 for ; Mon, 14 Jan 2019 15:10:38 +0000 (UTC) Received: from localhost ([127.0.0.1]:49538 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3ss-0007Js-0K for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Jan 2019 10:10:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35423) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3kD-0006H7-3P for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj3k9-0005J9-CY for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:41 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:50880) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj3k9-0005GT-46 for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:37 -0500 Received: by mail-wm1-x32c.google.com with SMTP id n190so9261102wmd.0 for ; Mon, 14 Jan 2019 07:01:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mDKQnKVb+nmNC5VphHJVVGXu/jNoJlWpVPZET+TtN9g=; b=OA2XDoYtkf6cqSm/vedFoznsafGMfi6/1RtahxtHuJP+PZ00uUKbtSvFO2YwFb4b31 JBPIkMd62tksXgGjH1/2JggGyZmL55jCD+9DEUOyNqq90GZFhE8JyB+4AmKGsusmq40b n06HJ7wtrbaYScRAdQVnl/xPfWszfX9Zdirik= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mDKQnKVb+nmNC5VphHJVVGXu/jNoJlWpVPZET+TtN9g=; b=d3/BRfLx5k7/jL16nKMTy82HBnYkVO0w9+FglUaO8vUm5XOhcugjJtykWGr0DvqyqU 9OzIrCmZZhC/yGdh1ip42zy9ev2zsc8NXEiFeAoEhTKJ6dcdpB+4k67kvjVpeHvPak8A CpSPt1OjXf8wXzLrg8Vov/1vkU/nTRivmuyE/0NvtjX6V/a0RI2uuaeX6FBGDLWAyNZW jT4WTEBgYqSB3fiO3xLC+LoOjl7Sd1HMeSzlXnLakUJiv8kLx1T8+MSK5x4bGVX3zz0+ ymC816gTeUSKefUqhyy1igBkE8Mq93VXL4yBsn7dqZtLR9/gT4yoXgI8DiHO03NVTl9h ItQg== X-Gm-Message-State: AJcUukfHkOTuwCXnS6bSb4zs4oPqHmM/vwC72ds1ezhjBRESUtWs3Dc4 Esx74Tl5mHi9M+LCA6xmgHQ/rQ== X-Google-Smtp-Source: ALg8bN7PUycKckgLQ1Q/sqOvFNhwNh+mWX9E0b2TSXj5GrYCDx9p1LUtFrLoSQZvEzrLYKtaT405WQ== X-Received: by 2002:a1c:4301:: with SMTP id q1mr12115701wma.44.1547478094381; Mon, 14 Jan 2019 07:01:34 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id n127sm32804987wmd.20.2019.01.14.07.01.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jan 2019 07:01:31 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 2A5033E0DFD; Mon, 14 Jan 2019 15:01:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 14 Jan 2019 15:01:12 +0000 Message-Id: <20190114150129.1013-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114150129.1013-1-alex.bennee@linaro.org> References: <20190114150129.1013-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32c Subject: [Qemu-devel] [PULL 04/21] tests: update Fedora dockerfile to use Fedora 29 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: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Daniel P. Berrangé Fedora 29 is the current newest release, so switch to using that from the current Fedora 28. Signed-off-by: Daniel P. Berrangé Signed-off-by: Alex Bennée diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 1d0e3dc4ec..69d4a7f5d7 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,4 +1,4 @@ -FROM fedora:28 +FROM fedora:29 ENV PACKAGES \ bc \ bison \ @@ -82,7 +82,7 @@ ENV PACKAGES \ tar \ usbredir-devel \ virglrenderer-devel \ - vte3-devel \ + vte291-devel \ which \ xen-devel \ zlib-devel From patchwork Mon Jan 14 15:01:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 10762893 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BEEF31390 for ; Mon, 14 Jan 2019 15:03:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AFD4828FBC for ; Mon, 14 Jan 2019 15:03:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AE06F2904A; Mon, 14 Jan 2019 15:03:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 250D329026 for ; Mon, 14 Jan 2019 15:03:40 +0000 (UTC) Received: from localhost ([127.0.0.1]:48047 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3m7-0007mP-8q for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Jan 2019 10:03:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35388) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3kA-0006Eh-Dz for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj3k9-0005JT-Gk for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:38 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:46484) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj3k9-0005H6-7T for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:37 -0500 Received: by mail-wr1-x42c.google.com with SMTP id l9so23173631wrt.13 for ; Mon, 14 Jan 2019 07:01:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vqX7aDDA5UyNM9N2w41S+UYfUe6HV/fnJuxeVhHN1YM=; b=VRiRrEk8mNDogzXzTyXshw7zovXXbYnHD/7wgci8Rlaa6OP8tRPaAEqt9f8r2UNDo7 1twMG0F0qtL7tuQqQr3Zy7unbWLs+X2s9PMma3iBUhrC/xmRE5KH8JvNNDPt15JS95V8 V1jRyrCoRlFZA2gvQAozHbeOl0sBxM0/9IhZA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vqX7aDDA5UyNM9N2w41S+UYfUe6HV/fnJuxeVhHN1YM=; b=J7lvRQTEuzJzNKi44vGp71dmb9o9hFDSovBzvTcOHNCLr6P92GVaFLFYgLJZucN/Uk yu3N3+DfwGmZ0/o/Lmjfa7mcM+5ojnO87uUyf6Cury6o7Tn6YY064USr61el0wPpFweM 4TOuHatSJZKbh3C9CI3x02wYGoMLz9YtA5A4ImPBh6ehkWJqoBrOWZKMoJaJRUj9i7aE LIvjfuvPj3XPdab47gb4G8PMe2uz7eBB6bmzYRMW6BpRP27/svWWe5mUT0JvVZvpnnC8 OKFS7sNmhJCcAmIvJIUF7iMDoe9ZfrMl9r+erp1xEYVAj77nNVSypC+p8tx2dNO01KXY 5qLA== X-Gm-Message-State: AJcUukeKubXb91if+ZwqKztJWMN62vLAtiW7fK8B2XrpBhfoXM/dDbo6 ny5VaMdhFNQ968R1cAfkCW6NYg== X-Google-Smtp-Source: ALg8bN5NsK9Q+h/OROvD9T9Qu+px6x6WaLMcFOAGnNEg8ODCl+hTWbtSUy5t1ELjdrNMtvBq8qMI5w== X-Received: by 2002:a05:6000:1c8:: with SMTP id t8mr25225307wrx.146.1547478095765; Mon, 14 Jan 2019 07:01:35 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id f18sm59225761wrs.92.2019.01.14.07.01.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jan 2019 07:01:31 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 3F6DA3E0E13; Mon, 14 Jan 2019 15:01:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 14 Jan 2019 15:01:13 +0000 Message-Id: <20190114150129.1013-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114150129.1013-1-alex.bennee@linaro.org> References: <20190114150129.1013-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42c Subject: [Qemu-devel] [PULL 05/21] tests: update Fedora i386 cross image to Fedora 29 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: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Daniel P. Berrangé Using the "latest" tag is not a good idea because this changes what release it points to every 6 months. Together with caching of docker builds this can cause confusion where CI has cached & built with Fedora N, while a developer tries to reproduce a CI problem with Fedora N + 1, or vica-verca. Signed-off-by: Daniel P. Berrangé Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker b/tests/docker/dockerfiles/fedora-i386-cross.docker index a4fd895b07..eb8108d118 100644 --- a/tests/docker/dockerfiles/fedora-i386-cross.docker +++ b/tests/docker/dockerfiles/fedora-i386-cross.docker @@ -1,4 +1,4 @@ -FROM fedora:latest +FROM fedora:29 ENV PACKAGES \ gcc \ glib2-devel.i686 \ From patchwork Mon Jan 14 15:01:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 10762903 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 453F8139A for ; Mon, 14 Jan 2019 15:07:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3446D28FA6 for ; Mon, 14 Jan 2019 15:07:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 27B5028FD5; Mon, 14 Jan 2019 15:07:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CCDB828FA6 for ; Mon, 14 Jan 2019 15:07:22 +0000 (UTC) Received: from localhost ([127.0.0.1]:48783 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3pi-0004EF-2f for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Jan 2019 10:07:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35385) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3kA-0006Ef-DP for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj3k9-0005Jb-Hb for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:38 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:55479) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj3k9-0005Gm-8t for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:37 -0500 Received: by mail-wm1-x32a.google.com with SMTP id y139so9171885wmc.5 for ; Mon, 14 Jan 2019 07:01:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7PnQ2oZBHD47nBX7msv3G9gwywdnNA6a5+trZN6poUM=; b=Ksfz6LIKS2iurZxITvhafhzCbjLYJEVxqt2mTK9tVx9bURMwDxFoIFAFbch4x/r5wf 25wjU3e/ZjgavmGvv1QgtAEkt+BfntXx0eW7T3DyIdVlx2t17S7eSgSKFnIHGgqyVvEx O7e8b52GBiMlCm0okzcjZayE6dXDkEnq2mcaM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7PnQ2oZBHD47nBX7msv3G9gwywdnNA6a5+trZN6poUM=; b=HavvqM2BRUujKV1pkZoVGBueIiZCMuAiXCwkXDPOGYW99W5B9L6vPa6OJJEYGEM7ri v+y1kKD3732/u10xglRDhD8DE8IYxXBPqpA/D9v0TKrNpGe+OpHWbj2yNOoVZCENoviv niXzrp3qbHqjlakJ1MzRq6SnpQEhpx2kg4kfvitDpFVEKDl+yEtUfc7plDgoN97oEZcq +CJX5iMqOxUqY+fYF12ZoEOP1pSlUNYO7qt4JKIOfet12y/n+jbwHjd6fmL+kW2NsEXK 1/wWS86H/jvPsqF5/KwgZ03zvcVciEfZCKFfl/H4hacJ/Pcp638zUwlzdn2ybzJ/rLUb hvZA== X-Gm-Message-State: AJcUukeUo582PDpoRA6PDkDp2zcLj87YitvSLXqSqntIuyBlQCXJe9Y7 0vrcxcqzM+4tdwe+c0gKGssLJQ== X-Google-Smtp-Source: ALg8bN6whg4x/oCK9pLFLAnWFN6fj/c+8zr7hcfjT7XplQSJwwWf8Zw/YuSp2NzGyrpNSFDYz754oA== X-Received: by 2002:a1c:2c44:: with SMTP id s65mr12860475wms.80.1547478094978; Mon, 14 Jan 2019 07:01:34 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id n9sm59994529wrx.80.2019.01.14.07.01.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jan 2019 07:01:31 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 540CC3E0F77; Mon, 14 Jan 2019 15:01:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 14 Jan 2019 15:01:14 +0000 Message-Id: <20190114150129.1013-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114150129.1013-1-alex.bennee@linaro.org> References: <20190114150129.1013-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32a Subject: [Qemu-devel] [PULL 06/21] tests: use in-place sed magic for enabling deb-src in travis image 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: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This avoids potential problems with duplicates. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfiles/travis.docker index 03ebfb0ef2..46cf367488 100644 --- a/tests/docker/dockerfiles/travis.docker +++ b/tests/docker/dockerfiles/travis.docker @@ -2,7 +2,7 @@ FROM travisci/ci-garnet:packer-1512502276-986baf0 ENV DEBIAN_FRONTEND noninteractive ENV LANG en_US.UTF-8 ENV LC_ALL en_US.UTF-8 -RUN cat /etc/apt/sources.list | sed "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 -y build-dep qemu RUN apt-get -y install device-tree-compiler python2.7 python-yaml dh-autoreconf gdb strace lsof net-tools gcovr From patchwork Mon Jan 14 15:01:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 10762933 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BC5B51580 for ; Mon, 14 Jan 2019 15:20:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A95052927B for ; Mon, 14 Jan 2019 15:20:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A724C29317; Mon, 14 Jan 2019 15:20:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 04A0F2927B for ; Mon, 14 Jan 2019 15:20:30 +0000 (UTC) Received: from localhost ([127.0.0.1]:51884 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj42P-0006JE-B5 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Jan 2019 10:20:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35446) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3kE-0006Io-LT for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj3k9-0005Ji-J1 for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:42 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:38367) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj3k9-0005HC-9I for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:37 -0500 Received: by mail-wr1-x42e.google.com with SMTP id v13so23223089wrw.5 for ; Mon, 14 Jan 2019 07:01:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LRZCNdGylobkVLyyK37xleoMBFQe15hUyJ+EPDuYZhs=; b=NpLiAlJsSqS4S1n1WPefY6yWo5iccdzB1glK5f78vISk7cHLoJ2+7KIiaTmQ+5VCft 7uH/kQzoyb0npH2H0JCSBF/bIe2VlDPLS34b+rtzdGoHIOfoSG+u0WhKuT1sqgmBz762 ZUyAhcU83bkEpde3HBrZm8RqdytEvh4M7dER8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LRZCNdGylobkVLyyK37xleoMBFQe15hUyJ+EPDuYZhs=; b=HauBR8wi40jikN2oq7tPsF/0D04faScwSbH2mTI0Ls91XkiACe4pL3QjpFDJLI1wzg b7ije/rbBcJsR7XIFBw+BSPczJL/QisfcR1SySUk4fKSn8D4rOlI1QXXjC40ivBCHaAX f45pg96aDMuwRO9mjJv4EmzFODshhXqqaGcVfVxN3xsSDpAZ9sR72cAt4fZOyG7Du4UA /7Lmyl1d6Vh85qV05TWAR4UkwxFAPfrOWF+UdLCOqOXniVVJoxTGDPv5ke/Ceud5Lvnf RL+7kS8pwMoGm+3MwrLcsaC71x7nR2iZNzzJOR9sR+6jn1vw8WqKz/R4P9bZeYSv9x8K T5Yw== X-Gm-Message-State: AJcUukfPTXds2edut5mjVFcV7sNe3+grEyvqbMzg9NDY6L79pYZAUxn/ Q2rO/C9KLIw+saD7lTY6g4YS5g== X-Google-Smtp-Source: ALg8bN5xdwwJ0aV+pP6aqgntSI27KZ+DqjPP17Qeyx/nEQNkABJBIRUMmHstUbBoooJKQ8Z84iJ2YQ== X-Received: by 2002:a5d:60cc:: with SMTP id x12mr23875814wrt.193.1547478095887; Mon, 14 Jan 2019 07:01:35 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id f15sm74455424wrt.10.2019.01.14.07.01.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jan 2019 07:01:35 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 68AFF3E1011; Mon, 14 Jan 2019 15:01:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 14 Jan 2019 15:01:15 +0000 Message-Id: <20190114150129.1013-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114150129.1013-1-alex.bennee@linaro.org> References: <20190114150129.1013-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42e Subject: [Qemu-devel] [PULL 07/21] travis: add whitespace between each major section & matrix entry 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: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Daniel P. Berrangé Improve the readability of the travis config by adding two blank lines between each major section and matrix entry. Signed-off-by: Daniel P. Berrangé Signed-off-by: Alex Bennée diff --git a/.travis.yml b/.travis.yml index d472fd650b..bb43792627 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ # The current Travis default is a container based 14.04 Trust on EC2 # Additional builds with specific requirements for a full VM need to # be added as additional matrix: entries later on + sudo: false dist: trusty language: c @@ -9,6 +10,8 @@ python: compiler: - gcc cache: ccache + + addons: apt: packages: @@ -40,6 +43,7 @@ addons: - uuid-dev - gcovr + # The channel name "irc.oftc.net#qemu" is encrypted against qemu/qemu # to prevent IRC notifications from forks. This was created using: # $ travis encrypt -r "qemu/qemu" "irc.oftc.net#qemu" @@ -49,6 +53,8 @@ notifications: - secure: "F7GDRgjuOo5IUyRLqSkmDL7kvdU4UcH3Lm/W2db2JnDHTGCqgEdaYEYKciyCLZ57vOTsTsOgesN8iUT7hNHBd1KWKjZe9KDTZWppWRYVwAwQMzVeSOsbbU4tRoJ6Pp+3qhH1Z0eGYR9ZgKYAoTumDFgSAYRp4IscKS8jkoedOqM=" on_success: change on_failure: always + + env: global: - SRC_DIR="." @@ -63,9 +69,13 @@ env: - CONFIG="--enable-modules --disable-linux-user" - CONFIG="--with-coroutine=ucontext --disable-linux-user" - CONFIG="--with-coroutine=sigaltstack --disable-linux-user" + + git: # we want to do this ourselves submodules: false + + before_install: - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update ; fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install libffi gettext glib pixman ; fi @@ -75,54 +85,82 @@ before_script: - ${SRC_DIR}/configure ${CONFIG} || { cat config.log && exit 1; } script: - make ${MAKEFLAGS} && ${TEST_CMD} + + matrix: include: # Test out-of-tree builds - env: CONFIG="--enable-debug --enable-debug-tcg" BUILD_DIR="out-of-tree/build/dir" SRC_DIR="../../.." + + # Test with Clang for compile portability (Travis uses clang-5.0) - env: CONFIG="--disable-system" compiler: clang + + - env: CONFIG="--disable-user" compiler: clang + + # gprof/gcov are GCC features - env: CONFIG="--enable-gprof --enable-gcov --disable-pie --target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" after_success: - ${SRC_DIR}/scripts/travis/coverage-summary.sh compiler: gcc + + # We manually include builds which we disable "make check" for - env: CONFIG="--enable-debug --enable-tcg-interpreter" TEST_CMD="" compiler: gcc + + # We don't need to exercise every backend with every front-end - env: CONFIG="--enable-trace-backends=log,simple,syslog --disable-system" TEST_CMD="" compiler: gcc + + - env: CONFIG="--enable-trace-backends=ftrace --target-list=x86_64-softmmu" TEST_CMD="" compiler: gcc + + - env: CONFIG="--enable-trace-backends=ust --target-list=x86_64-softmmu" TEST_CMD="" compiler: gcc + + - env: CONFIG="--disable-tcg" TEST_CMD="" compiler: gcc + + # MacOSX builds - env: CONFIG="--target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" os: osx osx_image: xcode9.4 compiler: clang + + - env: CONFIG="--target-list=i386-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,x86_64-softmmu" os: osx osx_image: xcode10 compiler: clang + + # Python builds - env: CONFIG="--target-list=x86_64-softmmu" python: - "3.0" + + - env: CONFIG="--target-list=x86_64-softmmu" python: - "3.6" + + # Acceptance (Functional) tests - env: CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu" TEST_CMD="make AVOCADO_SHOW=app check-acceptance" @@ -131,6 +169,8 @@ matrix: packages: - python3-pip - python3.4-venv + + # Using newer GCC with sanitizers - addons: apt: @@ -175,6 +215,8 @@ matrix: - TEST_CMD="" before_script: - ./configure ${CONFIG} --extra-cflags="-g3 -O0 -fsanitize=thread -fuse-ld=gold" || { cat config.log && exit 1; } + + - env: - CONFIG="--disable-system --disable-docs" - TEST_CMD="make check-tcg" From patchwork Mon Jan 14 15:01:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 10762913 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B21FA1390 for ; Mon, 14 Jan 2019 15:10:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A116929049 for ; Mon, 14 Jan 2019 15:10:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9F0CB28FF2; Mon, 14 Jan 2019 15:10:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 76575290D4 for ; Mon, 14 Jan 2019 15:10:38 +0000 (UTC) Received: from localhost ([127.0.0.1]:49534 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3sr-0007JS-EP for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Jan 2019 10:10:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35494) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3kG-0006L2-Rg for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj3kB-0005Kh-8x for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:44 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:55486) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj3kB-0005KB-2R for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:39 -0500 Received: by mail-wm1-x331.google.com with SMTP id y139so9172102wmc.5 for ; Mon, 14 Jan 2019 07:01:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=U+OlqDKqDIYrrbBGefOl7jb9DYBINRmn0sW65qD+ZUU=; b=aAcU5+be1niMiSInL1XwJLAhhd8ZhbMCk3MWgWDM8nRbVCXLHxWf/428zKwo9fmk26 YF7ETLzo8uRvXgW0UbEbOcLWDollt8TDtG4DK9zFzOtiOmRtTYNoiqWtvSzsyMhKjn+1 uPi5eJ6biR+YLV9DgFbr2Uv0BQLI5ECYrjiuc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=U+OlqDKqDIYrrbBGefOl7jb9DYBINRmn0sW65qD+ZUU=; b=EF274KzxyPAUKITeRNMTkpJwjw4IBVSxF4qw7PYn4lpP21nbyKifyvl1fdPY0ofAgO r0hEvOsJoqoz2pCd9Aok2VD/gUgJhni3UXhwdmwkoqFCwn16UYiIgD9vlJ8NvgH+lWZu b3RIWMDpeZV3FZJ2OCOJ6QTI1DLeLvu67g0JKv+CuGyD+drYp5Z3tzx79S3R54bIeYl2 RQ8GpsDGxkFU0KFzB700c+7wXHVkpQQoBnmgDQJPxD1v9x2qYlty2Z/Ynz/B2PoOuCPQ CtiugBpU5VVBpnsMqysStFtR7/HKY/hVl6htgkMJGPsKftuU/K1TkXN90WxHFta8m863 +ZGA== X-Gm-Message-State: AJcUukeKmgh653QNXEeEPZBIvuSY9aO4ZajZAEbMbzx/MtMDTOzE/1P2 dn55bdSwxP9spiQXhs3YT6sH7A== X-Google-Smtp-Source: ALg8bN6EirSMMxnRYwMWkyUFkAucMv32e3/0JIDTpQUxFBXGRSbyNC/fbfgo038WJxjUBGAVHI3gMQ== X-Received: by 2002:a7b:c5cc:: with SMTP id n12mr12268289wmk.149.1547478097968; Mon, 14 Jan 2019 07:01:37 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b12sm59330048wrt.17.2019.01.14.07.01.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jan 2019 07:01:35 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 7E05B3E101E; Mon, 14 Jan 2019 15:01:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 14 Jan 2019 15:01:16 +0000 Message-Id: <20190114150129.1013-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114150129.1013-1-alex.bennee@linaro.org> References: <20190114150129.1013-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::331 Subject: [Qemu-devel] [PULL 08/21] travis: define all the build matrix entries in one place 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: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Daniel P. Berrangé The current build matrix is constructed from entries listed under the environment variable config section, as well as the general purpose build matrix section. Move everything under the general purpose section so it is clear at a glance what is in the matrix. Signed-off-by: Daniel P. Berrangé Signed-off-by: Alex Bennée diff --git a/.travis.yml b/.travis.yml index bb43792627..96917df9c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,14 +61,6 @@ env: - BUILD_DIR="." - TEST_CMD="make check" - MAKEFLAGS="-j3" - matrix: - - CONFIG="--disable-system" - - CONFIG="--disable-user" - - CONFIG="--enable-debug --enable-debug-tcg" - - CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr --disable-brlapi --disable-uuid --disable-libusb --disable-user" - - CONFIG="--enable-modules --disable-linux-user" - - CONFIG="--with-coroutine=ucontext --disable-linux-user" - - CONFIG="--with-coroutine=sigaltstack --disable-linux-user" git: @@ -89,6 +81,27 @@ script: matrix: include: + - env: CONFIG="--disable-system" + + + - env: CONFIG="--disable-user" + + + - env: CONFIG="--enable-debug --enable-debug-tcg" + + + - env: CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr --disable-brlapi --disable-uuid --disable-libusb --disable-user" + + + - env: CONFIG="--enable-modules --disable-linux-user" + + + - env: CONFIG="--with-coroutine=ucontext --disable-linux-user" + + + - env: CONFIG="--with-coroutine=sigaltstack --disable-linux-user" + + # Test out-of-tree builds - env: CONFIG="--enable-debug --enable-debug-tcg" BUILD_DIR="out-of-tree/build/dir" SRC_DIR="../../.." From patchwork Mon Jan 14 15:01:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 10762923 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 85C4D1390 for ; Mon, 14 Jan 2019 15:13:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 738EE2892B for ; Mon, 14 Jan 2019 15:13:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7150228992; Mon, 14 Jan 2019 15:13:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DA63B288BB for ; Mon, 14 Jan 2019 15:13:49 +0000 (UTC) Received: from localhost ([127.0.0.1]:50315 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3vx-0001Os-4Z for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Jan 2019 10:13:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35512) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3kI-0006Mk-Hw for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj3kC-0005Lp-NB for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:46 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:34457) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj3kC-0005Ky-Dx for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:40 -0500 Received: by mail-wr1-x431.google.com with SMTP id j2so23309929wrw.1 for ; Mon, 14 Jan 2019 07:01:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=raXxHAfIsAcqcOIkDe4iPDQinpBc2ZkVV/GqVccuyCs=; b=UFLMOMWRch7kvfv3NHbFLXxyJJCzD3QCUsglfkM75qbd6aRZpv4n+DC8a4eNw/Eo1F A+MVuXRYTKOgMqx8DTklPrsRT/Q7wkqCDILFdAohwW9DkUmTi3sq3t4nHMKfllLfswMw DjchGlOux/8HAcO4qiaLCUloUylVDNLw/F4EI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=raXxHAfIsAcqcOIkDe4iPDQinpBc2ZkVV/GqVccuyCs=; b=gbjlH2H/Wd53pRLhtc+B99jlOeX+lS5a5P3/WuXW+J9DfiFzfMLkZ74JoGBjS4V/sD a1h32z7UHDTXXr2r4qUy/s8uaUhXQIoK8mHaIfdD/yz+K0rCO2/Wz6CAHzYciqjiKeo1 xg7L0QhNTg0Q2yDFN2g4aBkZgFvoYLFSun0qKLH2yCtIlQ0Nn/S522BG2SUnZwySfq+R oilxjq3P8S9K4iYHUbquktCkJdt/cjbt4cWBMdDpCnDTPiRYl9CyW3B+C80WC8DZjEmZ mQD5mdbw0cQrtbOGDNybWvEEtNs/pLGu90K2xNRzICHc0K5G0ldBC9Gcryb2kSlTi6n/ z9ig== X-Gm-Message-State: AJcUukc9108WCCmrMK45w/Gb/I8vsjKhWqZTwJxiWX1P7Idr1/7MVg6o 4XcGFKwtL6IzmoZvaSUx4zidHA== X-Google-Smtp-Source: ALg8bN5rc+ONvAvLfvoCFP1SGws5Uz46yYzRRLe0tq1tg+GrSMhzZZz48oftEF2XYLFNLxyhp8IrUA== X-Received: by 2002:adf:ee07:: with SMTP id y7mr25522823wrn.187.1547478099286; Mon, 14 Jan 2019 07:01:39 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c14sm25161069wme.13.2019.01.14.07.01.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jan 2019 07:01:36 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 92FC33E1073; Mon, 14 Jan 2019 15:01:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 14 Jan 2019 15:01:17 +0000 Message-Id: <20190114150129.1013-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114150129.1013-1-alex.bennee@linaro.org> References: <20190114150129.1013-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::431 Subject: [Qemu-devel] [PULL 09/21] travis: standardize the syntax used for env variables 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: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Daniel P. Berrangé Matrix entries are defining env variables using two different syntax styles: - env: FOO=bar WIZZ=bang and - env: - FOO=bar - WIZZ=bang Switch everything to use the latter style as the more normal indentation approach. Signed-off-by: Daniel P. Berrangé Signed-off-by: Alex Bennée diff --git a/.travis.yml b/.travis.yml index 96917df9c5..f539f8b556 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,102 +81,123 @@ script: matrix: include: - - env: CONFIG="--disable-system" + - env: + - CONFIG="--disable-system" - - env: CONFIG="--disable-user" + - env: + - CONFIG="--disable-user" - - env: CONFIG="--enable-debug --enable-debug-tcg" + - env: + - CONFIG="--enable-debug --enable-debug-tcg" - - env: CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr --disable-brlapi --disable-uuid --disable-libusb --disable-user" + - env: + - CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr --disable-brlapi --disable-uuid --disable-libusb --disable-user" - - env: CONFIG="--enable-modules --disable-linux-user" + - env: + - CONFIG="--enable-modules --disable-linux-user" - - env: CONFIG="--with-coroutine=ucontext --disable-linux-user" + - env: + - CONFIG="--with-coroutine=ucontext --disable-linux-user" - - env: CONFIG="--with-coroutine=sigaltstack --disable-linux-user" + - env: + - CONFIG="--with-coroutine=sigaltstack --disable-linux-user" # Test out-of-tree builds - - env: CONFIG="--enable-debug --enable-debug-tcg" - BUILD_DIR="out-of-tree/build/dir" SRC_DIR="../../.." + - env: + - CONFIG="--enable-debug --enable-debug-tcg" + - BUILD_DIR="out-of-tree/build/dir" SRC_DIR="../../.." # Test with Clang for compile portability (Travis uses clang-5.0) - - env: CONFIG="--disable-system" + - env: + - CONFIG="--disable-system" compiler: clang - - env: CONFIG="--disable-user" + - env: + - CONFIG="--disable-user" compiler: clang # gprof/gcov are GCC features - - env: CONFIG="--enable-gprof --enable-gcov --disable-pie --target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" + - env: + - CONFIG="--enable-gprof --enable-gcov --disable-pie --target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" after_success: - ${SRC_DIR}/scripts/travis/coverage-summary.sh compiler: gcc # We manually include builds which we disable "make check" for - - env: CONFIG="--enable-debug --enable-tcg-interpreter" - TEST_CMD="" + - env: + - CONFIG="--enable-debug --enable-tcg-interpreter" + - TEST_CMD="" compiler: gcc # We don't need to exercise every backend with every front-end - - env: CONFIG="--enable-trace-backends=log,simple,syslog --disable-system" - TEST_CMD="" + - env: + - CONFIG="--enable-trace-backends=log,simple,syslog --disable-system" + - TEST_CMD="" compiler: gcc - - env: CONFIG="--enable-trace-backends=ftrace --target-list=x86_64-softmmu" - TEST_CMD="" + - env: + - CONFIG="--enable-trace-backends=ftrace --target-list=x86_64-softmmu" + - TEST_CMD="" compiler: gcc - - env: CONFIG="--enable-trace-backends=ust --target-list=x86_64-softmmu" - TEST_CMD="" + - env: + - CONFIG="--enable-trace-backends=ust --target-list=x86_64-softmmu" + - TEST_CMD="" compiler: gcc - - env: CONFIG="--disable-tcg" - TEST_CMD="" + - env: + - CONFIG="--disable-tcg" + - TEST_CMD="" compiler: gcc # MacOSX builds - - env: CONFIG="--target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" + - env: + - CONFIG="--target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" os: osx osx_image: xcode9.4 compiler: clang - - env: CONFIG="--target-list=i386-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,x86_64-softmmu" + - env: + - CONFIG="--target-list=i386-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,x86_64-softmmu" os: osx osx_image: xcode10 compiler: clang # Python builds - - env: CONFIG="--target-list=x86_64-softmmu" + - env: + - CONFIG="--target-list=x86_64-softmmu" python: - "3.0" - - env: CONFIG="--target-list=x86_64-softmmu" + - env: + - CONFIG="--target-list=x86_64-softmmu" python: - "3.6" # Acceptance (Functional) tests - - env: CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu" - TEST_CMD="make AVOCADO_SHOW=app check-acceptance" + - env: + - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu" + - TEST_CMD="make AVOCADO_SHOW=app check-acceptance" addons: apt: packages: From patchwork Mon Jan 14 15:01:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 10762937 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 68A1D139A for ; Mon, 14 Jan 2019 15:23:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5910628708 for ; Mon, 14 Jan 2019 15:23:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5767928757; Mon, 14 Jan 2019 15:23:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F12AE28742 for ; Mon, 14 Jan 2019 15:23:48 +0000 (UTC) Received: from localhost ([127.0.0.1]:52606 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj45c-0000X1-4s for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Jan 2019 10:23:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35516) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3kJ-0006NC-3G for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj3kD-0005Me-BH for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:46 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:36111) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj3kD-0005LT-5Z for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:41 -0500 Received: by mail-wm1-x336.google.com with SMTP id p6so9158900wmc.1 for ; Mon, 14 Jan 2019 07:01:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MWZXnt2CeW7UnU1xrIpdQeqs6SLR80pB2H6G+FOpxMw=; b=MMvmAAm4ghvAichqU+K5v9mDJt9Spzr2R3cpDKZK2UscU0qm0NllYCfmT+AWy6MbRc yhfycxRNtwaVnQe+cKp7vTYduFB+CyBQipp1ckW8V+kDtEEOpHevFnI1TtMcaNw1FBIc g0XtArL9a/s3wzBtpNqDuQC5+X2+jK5rO7YRQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MWZXnt2CeW7UnU1xrIpdQeqs6SLR80pB2H6G+FOpxMw=; b=Oav2phOobyiYM9N0XsOUyj7oJ0rU9O2nuhwlG/WCLD6nGrn9EBEbnhK+LD9j5gXDTL hjX/JrOutdA4g9NDf7C/d1D5Er/XmSH+Z35c+3T8CiSe3K2ldhPrA4CQo6XDrVLCIkqm wst/BYWAA9UV24I9taXI8UjuitqUbFGm1jWFaotEc7SyzcekOyGMHgigJHS8LiPrQVq2 IspLK470tTbaUGq5zDOkreVgx/MgPDx0GKg9KEDgNr38iP6nDQ1P8Y0/3tarittATkIu eNo+DwNQqFFUsN7xsDmtiOok1/tZHKIYEM2Uiz/x2bQpzQXrDSAqsihlyl4AFSs5c2hS xEQg== X-Gm-Message-State: AJcUukeNU63sNctH8q5S39bJEioModVYMqLdXlWoARsSSjQlLYtHD6t7 BX51YQDnylTo+pHvZAqF1cJznA== X-Google-Smtp-Source: ALg8bN4jU+nQ3o05+URiI28sBuFvWa8kd1V8jK5C87jXhrYEZjWCIa7kXv5mELtkk1otkYXOFM2OhA== X-Received: by 2002:a1c:7409:: with SMTP id p9mr12558709wmc.136.1547478100124; Mon, 14 Jan 2019 07:01:40 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y13sm53875797wrw.85.2019.01.14.07.01.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jan 2019 07:01:36 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id A7B803E10B2; Mon, 14 Jan 2019 15:01:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 14 Jan 2019 15:01:18 +0000 Message-Id: <20190114150129.1013-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114150129.1013-1-alex.bennee@linaro.org> References: <20190114150129.1013-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::336 Subject: [Qemu-devel] [PULL 10/21] travis: don't clone git submodules upfront 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: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Daniel P. Berrangé The configure script & Makefile are already capable of figuring out which git submodules are required for a given build platform, and cloning them at the right time. Signed-off-by: Daniel P. Berrangé Signed-off-by: Alex Bennée diff --git a/.travis.yml b/.travis.yml index f539f8b556..fa70429459 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,7 +71,6 @@ git: before_install: - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update ; fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install libffi gettext glib pixman ; fi - - git submodule update --init --recursive capstone dtc ui/keycodemapdb before_script: - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} - ${SRC_DIR}/configure ${CONFIG} || { cat config.log && exit 1; } From patchwork Mon Jan 14 15:01:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 10762941 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7CFBA139A for ; Mon, 14 Jan 2019 15:26:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6DA92291A5 for ; Mon, 14 Jan 2019 15:26:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 61880293D9; Mon, 14 Jan 2019 15:26:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id ED946291A5 for ; Mon, 14 Jan 2019 15:26:27 +0000 (UTC) Received: from localhost ([127.0.0.1]:53220 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj48A-0002f9-UV for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Jan 2019 10:26:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37485) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3tJ-0007fU-GR for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:11:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj3tI-0001G0-PQ for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:11:05 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:35404) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj3tH-0001D0-SB for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:11:04 -0500 Received: by mail-wm1-x331.google.com with SMTP id t200so9264328wmt.0 for ; Mon, 14 Jan 2019 07:11:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ht1UYDlF5nf9+vVu/l2q9tJTCuRnrOntvUkY+uY1h1Y=; b=H9HoFfQggLnBN7zHFdaHDHQHGU2br+r3xXiRi8k346iJCVE/URQ3r/wUwNqHyaXUI4 oUo6p23j7iyfgs3AXiUlZHVaTMZHgrO0vqE0a7eGqXFJSwNgAtyig/BGUu9AAvqyeMX3 1PVyRoo5uunsUj0x0y1azb4N/H74+fc+6oBvE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ht1UYDlF5nf9+vVu/l2q9tJTCuRnrOntvUkY+uY1h1Y=; b=QRBKWs+BapYam8uRrqiI/mk7s6yPd0S+c//2LT5hJUC/VtpxTujHkhttVbk/y6plXV VKwIl0fO7QOGGOHVQTvBqhnUvsE0v9W+quZMj6e35sSJ5PqMZ/1CA8fcaOQvNxt6317j 7aqwrsUtT8RfBtKrJ5+KbACj0D20XHyOIqkXK3OAYPf5mJjHYtp6dk9rZsGDt6Bco76F bkhNmieaGf++Au0qVwRJ5eEX3G3cqQX8FbRuemtjd+IP13Xkxvqx+kz64iv3/EuEZ7lf FCyl/sEVagx2Al1Mik1HzaQYdqb++jzNUPPfehd9IZZWu21g34r+NpMQ4wnYwmFX9Lve Gs3g== X-Gm-Message-State: AJcUukclEci/0aFLr72xSGatSgKJrd/ASM5e6blt4YBxMLRVRiodRnkd AeEhOdpBYBlGKYU9C9FteINnMQ== X-Google-Smtp-Source: ALg8bN6JI+LBAdcgjg2U5g1nMrrzXTDTJXp0wXjIVkYGXMkU/IUPvSHZ0y7wS6kz0Zm8oNQPC4CPSg== X-Received: by 2002:a1c:ab87:: with SMTP id u129mr12372400wme.104.1547478660583; Mon, 14 Jan 2019 07:11:00 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id q3sm74021512wrn.84.2019.01.14.07.10.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jan 2019 07:10:58 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id BC34B3E1138; Mon, 14 Jan 2019 15:01:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 14 Jan 2019 15:01:19 +0000 Message-Id: <20190114150129.1013-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114150129.1013-1-alex.bennee@linaro.org> References: <20190114150129.1013-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::331 Subject: [Qemu-devel] [PULL 11/21] travis: use homebrew addon for MacOSX 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: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Rather than poking homebrew manually we can specify the packages needed via the homebrew addon. These are only installed on MacOS based builds. Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé diff --git a/.travis.yml b/.travis.yml index fa70429459..2ef7997d25 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,6 +42,12 @@ addons: - sparse - uuid-dev - gcovr + homebrew: + packages: + - libffi + - gettext + - glib + - pixman # The channel name "irc.oftc.net#qemu" is encrypted against qemu/qemu @@ -68,9 +74,6 @@ git: submodules: false -before_install: - - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update ; fi - - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install libffi gettext glib pixman ; fi before_script: - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} - ${SRC_DIR}/configure ${CONFIG} || { cat config.log && exit 1; } From patchwork Mon Jan 14 15:01:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 10762915 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 195D0139A for ; Mon, 14 Jan 2019 15:12:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0484C291C9 for ; Mon, 14 Jan 2019 15:12:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0268B29210; Mon, 14 Jan 2019 15:12:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9810829202 for ; Mon, 14 Jan 2019 15:12:08 +0000 (UTC) Received: from localhost ([127.0.0.1]:49876 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3uJ-0008Qa-0q for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Jan 2019 10:12:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35418) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3kC-0006Go-NV for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj3kB-0005L6-U8 for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:40 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:38373) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj3kB-0005KZ-Nj for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:39 -0500 Received: by mail-wr1-x434.google.com with SMTP id v13so23223283wrw.5 for ; Mon, 14 Jan 2019 07:01:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6yfe1i9POvvD9eR3DdDpidndCBbnuE1App/Jbb8vFWQ=; b=dXo+aSNXac/JbKaYrg0ncgEgaJbbuyX2t6MdNel/I+PmrScLItcEObsJTekFVWLlWk 56qwoBxkk5u3SLG6C6z61deziTB1xHQUzN2hZHspau0wFrYDristvRdhfI6eq16GbGtr 88D2oeqQ48UYFaX/FiC3rTNuV7YoVDb4+hWcw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6yfe1i9POvvD9eR3DdDpidndCBbnuE1App/Jbb8vFWQ=; b=m6jQULFlZJ7Ea8OquYEAYp1wF7ju9aE5kheEaZ4lNHBuom9qzYASd/Jv7OF5cdIbLm u5PaOEHnRFO3/5Y5+9J0TKmjgSdh45AbRrUCPuNhUiE1i2VJ2f/S/vYf9sTzBR5WK8Pz 7zRpMx6gyhoTNY+wKaWyt3zBM+6uthTSiLJvpvhypRGVIIbZzhjiA/E80VUOLPY+94FO L6uSEEfWriak7rH2+PZWRRZtPww5MKd1RCVJLkOM0bARJg2kxi9l2I6R5dRAPv3r1/vV r2ratRRII3OfEUanXn1O6LwCYpwEuDRgl+Mf8bBbwiDJsubHsZ3bhQ4FjiVkWebTG9Di dXxA== X-Gm-Message-State: AJcUukdOP3K3PEolOBiUsZSBR1WCpAv5bsnF22JVc4aQrwRDqH3InR8J FijPq0YagQMno/I6PCf1i13xLQ== X-Google-Smtp-Source: ALg8bN77cSvBmhQgnsWwqmbVNFy4VDAqvAOkLG2ttqpgdY3mSEQ6RvVyVF0BmX588OlclKpKzbuDsw== X-Received: by 2002:adf:e9d1:: with SMTP id l17mr23200510wrn.73.1547478098630; Mon, 14 Jan 2019 07:01:38 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 129sm46295478wmd.18.2019.01.14.07.01.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jan 2019 07:01:36 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id CF6873E1185; Mon, 14 Jan 2019 15:01:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 14 Jan 2019 15:01:20 +0000 Message-Id: <20190114150129.1013-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114150129.1013-1-alex.bennee@linaro.org> References: <20190114150129.1013-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 Subject: [Qemu-devel] [PULL 12/21] travis: stop redefining the script commands 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: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Daniel P. Berrangé One of the matrix entries redefines the script command in order to add the ${MAKEFLAGS} variable. Ideally ${MAKEFLAGS} would be referenced by the definition of the ${TEST_CMD} env variable, but this isn't possible in travis. ${MAKEFLAGS} exists to eliminate duplication of flags in every "make" command, but this cure causes a worse problem, namely the reduplication of the "script" command. It is simpler to just insert "-j3" directly into any "make" command. Signed-off-by: Daniel P. Berrangé Signed-off-by: Alex Bennée diff --git a/.travis.yml b/.travis.yml index 2ef7997d25..7b18d33e9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,8 +65,7 @@ env: global: - SRC_DIR="." - BUILD_DIR="." - - TEST_CMD="make check" - - MAKEFLAGS="-j3" + - TEST_CMD="make check -j3" git: @@ -78,7 +77,7 @@ before_script: - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} - ${SRC_DIR}/configure ${CONFIG} || { cat config.log && exit 1; } script: - - make ${MAKEFLAGS} && ${TEST_CMD} + - make -j3 && ${TEST_CMD} matrix: @@ -255,9 +254,7 @@ matrix: - env: - CONFIG="--disable-system --disable-docs" - - TEST_CMD="make check-tcg" - script: - - make ${MAKEFLAGS} && ${TEST_CMD} ${MAKEFLAGS} + - TEST_CMD="make -j3 check-tcg" sudo: required dist: trusty compiler: gcc From patchwork Mon Jan 14 15:01:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 10762943 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B129613B5 for ; Mon, 14 Jan 2019 15:27:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A151A291A5 for ; Mon, 14 Jan 2019 15:27:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9532F29417; Mon, 14 Jan 2019 15:27:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6DA45291A5 for ; Mon, 14 Jan 2019 15:27:39 +0000 (UTC) Received: from localhost ([127.0.0.1]:53495 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj49K-0003Zb-Lg for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Jan 2019 10:27:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37553) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3tL-0007h5-8T for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:11:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj3tJ-0001Gj-CS for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:11:07 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:43548) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj3tJ-0001Fh-69 for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:11:05 -0500 Received: by mail-wr1-x42e.google.com with SMTP id r10so23253392wrs.10 for ; Mon, 14 Jan 2019 07:11:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VQekcSe0tI66NTp2R1ZjwEFNstOHZpvFk8rU7MW7MFQ=; b=CwDMI7gvyXVaGmIdb8yaSco97Yc2y7lkQKjopOcThqsCpjg+JhipCmMaQTHf24ZS9e rddjrTiH+JahsKxMdBtck8Vwbyd0YTgdshw1uCXZb7pzML6GGN1WCZ5ajReuZT7qzgSm Fm0reQAagK/EIonvvNctTr6wEtZoqSYh54E5o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VQekcSe0tI66NTp2R1ZjwEFNstOHZpvFk8rU7MW7MFQ=; b=dmhA0Ovsl4QnbO1vSYNWZ3vraVlLLtXvyyY+2WxYmIxwy46VHefa/feBGx0RYMq1E9 I6fTEz42mT5Vczo7x6wLL15z3v5suvhux/tJmuPvzp0hy7QzZisv2pVQFZX5SF5QZx3X s2PTokc2lxwN+IXzDv7OzO45gWCPmSSgnnsB23uMs7ux9xiHJQHe7QsGMdBSc5dvS/7p E/S3YLQt99vrLxuaf8oDgX2Kvp+i1l3FBbb2kfap/wYBLRTWupimT4d2F9k1DpnvVc0l nsNppqK7I1TkeiDU4WsTG2yigKR/HOUghxEF6GHaEh7Maz0JZWJi8LALrnqlpsSmPliS 7aAg== X-Gm-Message-State: AJcUukf54TtqiR5eQmQgF7wEjQYxW8PoZLOLpWWpTWg5AJ0gkTBaoJmr GnWZ3Ch8scBXUxAi2YYRqtTyzA== X-Google-Smtp-Source: ALg8bN6U4Gw4zqY9pgHoBNj2TpctJDdZDEb/Lz2puazz1DkjpIXJ3opmrlK2u/ewaTprklsnkhnC6w== X-Received: by 2002:a5d:50c5:: with SMTP id f5mr23801218wrt.37.1547478664018; Mon, 14 Jan 2019 07:11:04 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id n6sm29107301wmk.9.2019.01.14.07.10.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jan 2019 07:11:02 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id E3CAD3E11E5; Mon, 14 Jan 2019 15:01:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 14 Jan 2019 15:01:21 +0000 Message-Id: <20190114150129.1013-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114150129.1013-1-alex.bennee@linaro.org> References: <20190114150129.1013-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42e Subject: [Qemu-devel] [PULL 13/21] travis: stop using container based envs 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: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Daniel P. Berrangé The Travis container based envs are deprecated: https://docs.travis-ci.com/user/reference/trusty/ "Container-based infrastructure is currently being deprecated. Please remove any sudo: false keys in your .travis.yml file to use the default fully-virtualized Linux infrastructure instead." Signed-off-by: Daniel P. Berrangé Signed-off-by: Alex Bennée diff --git a/.travis.yml b/.travis.yml index 7b18d33e9d..744dc050d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,4 @@ -# The current Travis default is a container based 14.04 Trust on EC2 -# Additional builds with specific requirements for a full VM need to -# be added as additional matrix: entries later on -sudo: false dist: trusty language: c python: @@ -255,6 +251,5 @@ matrix: - env: - CONFIG="--disable-system --disable-docs" - TEST_CMD="make -j3 check-tcg" - sudo: required dist: trusty compiler: gcc From patchwork Mon Jan 14 15:01:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 10762935 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D9574139A for ; Mon, 14 Jan 2019 15:23:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9D9429387 for ; Mon, 14 Jan 2019 15:23:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C80F929403; Mon, 14 Jan 2019 15:23:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7504529465 for ; Mon, 14 Jan 2019 15:23:01 +0000 (UTC) Received: from localhost ([127.0.0.1]:52445 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj44q-0008Le-Bb for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Jan 2019 10:23:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37481) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3tJ-0007fP-Dc for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:11:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj3tI-0001Fu-Ng for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:11:05 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:42588) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj3tF-0001Bd-Tv for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:11:03 -0500 Received: by mail-wr1-x429.google.com with SMTP id q18so23235376wrx.9 for ; Mon, 14 Jan 2019 07:11:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2X5bB6Z3iDlRkiKIWxC3bUR5tuKBHsA7VZEZgXj/4I0=; b=AHbK+cdrCRRKUpSrSm+EOoq/1dv4V8ywlNxhGK6wei89ZsC8+QizvMfmjDITyYVuI1 bTSq8Ln+P0oLajqokteqEm42eN1dJ1O39hvXQd9kq8SMo54WdzQ/eiSYXRV7MFefm4C8 nDaBPGQU/NZpn0lzb8YmClIq8WWqQqe/nKJPE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2X5bB6Z3iDlRkiKIWxC3bUR5tuKBHsA7VZEZgXj/4I0=; b=NlBsJPiR8jnqDi3oYyilxACMVrn0rENp/x9tNzg8NgM0I2Dhp0EoM1F1XqE19WwqKx ZfoKktOBEPjuREhkL7gIuEZyVKnjM1dFSSPahjDK10mzv+A5yJIFliqaRGk67SMhJ1br H028U8ilSaWj03ZY6ONuNPYyH8nGq4o0Y/igTSjfMG5QHS5C1l4OlvwFbRnRSaxTEK6x C0EOGAHFIgpbpWVSkNUjO8yVu7EVwqRP9m59r51H/M8lK1OB8T4vG0hWsxwsi7xHGaXi YSPOEzpAV9ubIXfUrCTzzzYxQXKIcNmporevYAS2Eywpl91tmbijsA8yWtKrfdrHbC7b 3uwg== X-Gm-Message-State: AJcUukezK1Pcr8taR3I2gu/cKGWEhD+Qt83Tusmlyr8WA60IHkr2MoMb zvnc5v+W/NpsZoK7tUc61TtSMA== X-Google-Smtp-Source: ALg8bN4/NgjXsziyaEf+FCNVFDk6C78JKwNxKus0h1EleZboCqeHYQu8RY2vLOxddkc1dezdeBIKHA== X-Received: by 2002:a5d:6244:: with SMTP id m4mr23938428wrv.314.1547478659265; Mon, 14 Jan 2019 07:10:59 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id j14sm59629972wrv.96.2019.01.14.07.10.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jan 2019 07:10:58 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 04D863E0865; Mon, 14 Jan 2019 15:01:31 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 14 Jan 2019 15:01:22 +0000 Message-Id: <20190114150129.1013-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114150129.1013-1-alex.bennee@linaro.org> References: <20190114150129.1013-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::429 Subject: [Qemu-devel] [PULL 14/21] travis: run tests in verbose mode 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: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Daniel P. Berrangé Travis sometimes fails a build because it produces no console output for over 10 minutes. If this is due to a genuine hang, it would be useful to have used verbose test output to see where it failed. If this is just due to tests being very slow, having verbose output might allow the build to succeed. Signed-off-by: Daniel P. Berrangé Signed-off-by: Alex Bennée diff --git a/.travis.yml b/.travis.yml index 744dc050d6..39dbda7a0b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,7 +61,7 @@ env: global: - SRC_DIR="." - BUILD_DIR="." - - TEST_CMD="make check -j3" + - TEST_CMD="make check -j3 V=1" git: @@ -250,6 +250,6 @@ matrix: - env: - CONFIG="--disable-system --disable-docs" - - TEST_CMD="make -j3 check-tcg" + - TEST_CMD="make -j3 check-tcg V=1" dist: trusty compiler: gcc From patchwork Mon Jan 14 15:01:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 10762931 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 079F4139A for ; Mon, 14 Jan 2019 15:17:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC1D82869D for ; Mon, 14 Jan 2019 15:17:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E0666287BD; Mon, 14 Jan 2019 15:17:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8D7222869D for ; Mon, 14 Jan 2019 15:17:16 +0000 (UTC) Received: from localhost ([127.0.0.1]:51154 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3zH-00043t-DP for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Jan 2019 10:17:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35533) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3kL-0006Nc-Uz for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj3kF-0005Pk-M4 for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:49 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:46493) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj3kF-0005PB-GU for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:43 -0500 Received: by mail-wr1-x434.google.com with SMTP id l9so23174159wrt.13 for ; Mon, 14 Jan 2019 07:01:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vr3IZ0ucwhomR89YTPuhPb+EZVMOl/uvVjRpdJoBwvg=; b=Eq3CEYGWVasUjs6MvgogOQlot75QsPmdKPSJYJ3g3CuHEtn1Opx3+af0wOeWSpmF/Q FBLg4N6ZTVxXG4WcAU8ucgK7LTv9ekM6PsuQZJr3dnVozZ+ghXW96+T5cIq1rlgpJTzY EOT3VhKiCB6LkTp8BS4EOYcLayGM5ABvucmYM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vr3IZ0ucwhomR89YTPuhPb+EZVMOl/uvVjRpdJoBwvg=; b=ZAXqekbBhJjDvCCLp29exuAko5BB/8O7str7mSx/HDocvd5QKHm2VS1wKGcCzkHLZd 6LGslE8J5QbtryjsSp2JD8XX1VKqxZ/k1DGgAVKOD/9iezsuND1NReSVqNy3RfjHTOYA D0rXhIoToca/+lTYHKWYR15vanborGZhdQc/3cIpzt1BM+DjqdF78YihfOelix1ebUdY LT3SkJAhNNDXqTsFK+H4RGPj3AJwGPUg0/f4Nx0GipBimlOcdFXco6o3qSOo4cLu4H9m TqRXcUBj1wNn18LR2cbqby11TG/Ds0KBVTdo38Yru5PoAH8uk+43aR2zPqBNOok4Pp0X b7/Q== X-Gm-Message-State: AJcUukfMQMrphwnkTwQOiXM9Py6oAagJKjRqzIe/w+jHMz/vhNgl+57A /iA7BRz+tUQIcR8CYtW6FvNdMQ== X-Google-Smtp-Source: ALg8bN5+UwZNseq0J7K+X+xsCPd8cGjFLsWepSrXTEx34HJq9C1oGpT8ry4TxB2ZvhWDJksmwQmY7A== X-Received: by 2002:adf:e509:: with SMTP id j9mr26188823wrm.76.1547478102538; Mon, 14 Jan 2019 07:01:42 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id e17sm56751635wrs.79.2019.01.14.07.01.35 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jan 2019 07:01:38 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 1AE753E1202; Mon, 14 Jan 2019 15:01:31 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 14 Jan 2019 15:01:23 +0000 Message-Id: <20190114150129.1013-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114150129.1013-1-alex.bennee@linaro.org> References: <20190114150129.1013-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 Subject: [Qemu-devel] [PULL 15/21] travis: remove matrix settings that duplicate global settings 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: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Daniel P. Berrangé The global defaults request "trusty" and "gcc", so matrix entries do not need to repeat this. Signed-off-by: Daniel P. Berrangé Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé diff --git a/.travis.yml b/.travis.yml index 39dbda7a0b..79da3a495a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -128,39 +128,33 @@ matrix: - CONFIG="--enable-gprof --enable-gcov --disable-pie --target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" after_success: - ${SRC_DIR}/scripts/travis/coverage-summary.sh - compiler: gcc # We manually include builds which we disable "make check" for - env: - CONFIG="--enable-debug --enable-tcg-interpreter" - TEST_CMD="" - compiler: gcc # We don't need to exercise every backend with every front-end - env: - CONFIG="--enable-trace-backends=log,simple,syslog --disable-system" - TEST_CMD="" - compiler: gcc - env: - CONFIG="--enable-trace-backends=ftrace --target-list=x86_64-softmmu" - TEST_CMD="" - compiler: gcc - env: - CONFIG="--enable-trace-backends=ust --target-list=x86_64-softmmu" - TEST_CMD="" - compiler: gcc - env: - CONFIG="--disable-tcg" - TEST_CMD="" - compiler: gcc # MacOSX builds @@ -251,5 +245,3 @@ matrix: - env: - CONFIG="--disable-system --disable-docs" - TEST_CMD="make -j3 check-tcg V=1" - dist: trusty - compiler: gcc From patchwork Mon Jan 14 15:01:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 10762969 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CA77313B5 for ; Mon, 14 Jan 2019 15:33:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BAC9E29424 for ; Mon, 14 Jan 2019 15:33:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF25D29472; Mon, 14 Jan 2019 15:33:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9A67629470 for ; Mon, 14 Jan 2019 15:33:12 +0000 (UTC) Received: from localhost ([127.0.0.1]:54670 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj4Eh-0008CR-G7 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Jan 2019 10:33:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37580) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3tO-0007l4-Vo for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:11:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj3tJ-0001GJ-2M for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:11:10 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:41051) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj3tI-0001EO-R5 for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:11:04 -0500 Received: by mail-wr1-x429.google.com with SMTP id x10so23227506wrs.8 for ; Mon, 14 Jan 2019 07:11:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PTkNnyty4VfOd8Y77rEQixw+U75c2okg6ezg0EaZYm8=; b=Y/jZ94/FoxpW4KrmKWn6gWhUfdMhdSkbTauPeF7OUdglyn2fPjlSyRY5a4RxGTfi31 +RkoSAd7s5wDomdLSI07PnKGE6h3mygcADoxWS6XUT+DziBhmblY0Pz/2NTpEIwP8sGF foaOMqlJuXJlJKm/vzug2AVv+3aFTlnUMXJNI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PTkNnyty4VfOd8Y77rEQixw+U75c2okg6ezg0EaZYm8=; b=OVE5OoCEd5zpAltNYYe/82oECVgURJtoaKeVCdkSmJOgvuFn8/uwjgxNrgw5iFAmaV sTCu4fI5+henxh6x4KRE1zAUKv+FgbO0TXs1w5btDXzM2YB7/HD5bh7OaUA9K3CM5MuK LiNzblfSq1/h6SvkAaCLKM5cnXpa7zNl+v/Ro9IPCCns98RHTwYAjqpjAYGujqSm4lXk y17K1a6hCHqHAE0kBRl5Ffas5QmhClUf7PN01QKBjvkBOTVJfsIII4pOjPwurVSOZJvv DVz3MPI7+WQgMGKetsra0i2GmeTEB4uoxE+qJMvhSv/leo6e1/0C5ZLwZvf9qfT4Kg6W NN9Q== X-Gm-Message-State: AJcUukfQcceaR2mLWGybC9uLo0J/bS4F8dqZ+Y/jbOgxpX1GilUBJvXl HtubeobySEqSPhOIFWZ7jiW/ow== X-Google-Smtp-Source: ALg8bN7IgsiQEh+z0A9Sj9emZoRnMvcvmr7c4OEkpBhpdeKyutkMm3uBgew6BfjXGSvyDnWoEtkp+A== X-Received: by 2002:adf:9467:: with SMTP id 94mr24391606wrq.305.1547478661440; Mon, 14 Jan 2019 07:11:01 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id a17sm71102199wrs.58.2019.01.14.07.10.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jan 2019 07:10:58 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 304753E1293; Mon, 14 Jan 2019 15:01:31 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 14 Jan 2019 15:01:24 +0000 Message-Id: <20190114150129.1013-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114150129.1013-1-alex.bennee@linaro.org> References: <20190114150129.1013-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::429 Subject: [Qemu-devel] [PULL 16/21] docker: Use a stable snapshot for Debian Sid 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: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Philippe Mathieu-Daudé The Debian Sid repository is not garanteed to be stable, as his 'unstable' name suggest :) To allow quick testing, packages are pushed various time a day, which my be annoying when trying to use it for stable development (which is not recommended, but Sid provides edge packages we use for testing). Debian provides repositories snapshots which are suitable for our use. Pick a recent date that works. When required, update to newer releases will be easy. This fixes current issues with this image: $ make docker-image-debian-sid [...] The following packages have unmet dependencies: build-essential : Depends: dpkg-dev (>= 1.17.11) but it is not going to be installed git : Depends: perl but it is not going to be installed Depends: liberror-perl but it is not going to be installed pkg-config : Depends: libdpkg-perl but it is not going to be installed texinfo : Depends: perl (>= 5.26.2-6) but it is not going to be installed Depends: libtext-unidecode-perl but it is not going to be installed Depends: libxml-libxml-perl but it is not going to be installed E: Unable to correct problems, you have held broken packages. Signed-off-by: Philippe Mathieu-Daudé [AJB: also tweak FROM to a earlier snapshot] Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/dockerfiles/debian-sid.docker b/tests/docker/dockerfiles/debian-sid.docker index 4e4cda0ba5..676941cb32 100644 --- a/tests/docker/dockerfiles/debian-sid.docker +++ b/tests/docker/dockerfiles/debian-sid.docker @@ -11,7 +11,12 @@ # updated and trigger a re-build. # -FROM debian:sid-slim +# This must be earlier than the snapshot date we are aiming for +FROM debian:sid-20181011-slim + +# Use a snapshot known to work (see http://snapshot.debian.org/#Usage) +ENV DEBIAN_SNAPSHOT_DATE "20181030" +RUN sed -i "s%^deb \(https\?://\)deb.debian.org/debian/\? \(.*\)%deb [check-valid-until=no] \1snapshot.debian.org/archive/debian/${DEBIAN_SNAPSHOT_DATE} \2%" /etc/apt/sources.list # Use a snapshot known to work (see http://snapshot.debian.org/#Usage) ENV DEBIAN_SNAPSHOT_DATE "20181030" From patchwork Mon Jan 14 15:01:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 10762961 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D7554139A for ; Mon, 14 Jan 2019 15:29:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C798B293A1 for ; Mon, 14 Jan 2019 15:29:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B968C293A5; Mon, 14 Jan 2019 15:29:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6D5CD293A1 for ; Mon, 14 Jan 2019 15:29:31 +0000 (UTC) Received: from localhost ([127.0.0.1]:53888 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj4B8-0004zE-Mn for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Jan 2019 10:29:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3tJ-0007ft-Vo for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:11:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj3tJ-0001Gb-9c for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:11:05 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:43791) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj3tJ-0001El-21 for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:11:05 -0500 Received: by mail-wr1-x443.google.com with SMTP id r10so23253275wrs.10 for ; Mon, 14 Jan 2019 07:11:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZT8rMg4iL7XO19E/FRLvwoUmB3HYvYNFWgaeRPw6GQw=; b=CfKpewG8VhXZUwPuCQPBfkWPjpWkd42j/F9pUua/brM55QQvANLiBBjV9Q5EffeEmU 80KPaLC0S/vfAAybUeAagwQJ10Za2BLX/1eGUdOsR454kDMQ6zp/r4OWIa1H3mHRJriG zfV57+XRqUv/2ti/tvCJp7uIbxefAmGMfZ6hk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZT8rMg4iL7XO19E/FRLvwoUmB3HYvYNFWgaeRPw6GQw=; b=WX4RaojRVpsqk8wlesJmcghtZNkk6ACNaH4Ed4oOKi07xIXbkMfd17duWSTfANyRUz w9BISqGK7r60AniLJtqJUGjfYXsgHhT7/i4X+ePF2ZnHowBbNNOyE4g2yWnEYuzgdIlN nhv2rjjYngOrnq6CJpfMZObj7mjYsW8BwgljkFWoMLcfhu6R2aCLmo/Eb3gCQIZZ5ZIw KALUUkr7HS1vHng/D+jdXSVpXymI1M1QxVBPt1RSOEQegyF2hs1/3IXC52DeFZelFVg6 PW5a1mJ4EDp+ZUuo4WC3M8rARfWkhK5eBH9439J2dh1PUBgZc9ycNvVYLAxqrHCMO9x+ h9qQ== X-Gm-Message-State: AJcUukfMFXF1+MDTtxXHQIwVSnkd3tlyKkEXoaD2L3ohRoOqoett1dgg Wpsu7nVKrtm12xwVj/+Hk+L+lA== X-Google-Smtp-Source: ALg8bN6fbkWJIkW+IaDxuy/G9evqveiW6TnIVqZ8OyxXZR1WiS1NCHVbGARU4R+BHf38zPaS4EMNDg== X-Received: by 2002:adf:ba05:: with SMTP id o5mr23841648wrg.325.1547478662262; Mon, 14 Jan 2019 07:11:02 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id n5sm75683643wrr.94.2019.01.14.07.10.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jan 2019 07:10:58 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 452D53E129C; Mon, 14 Jan 2019 15:01:31 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 14 Jan 2019 15:01:25 +0000 Message-Id: <20190114150129.1013-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114150129.1013-1-alex.bennee@linaro.org> References: <20190114150129.1013-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PULL 17/21] travis: bump to Xenial baseline 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: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Travis is slowly catching up. Move to Xenial based images for our current builds. These are now all proper VMs. Signed-off-by: Alex Bennée diff --git a/.travis.yml b/.travis.yml index 79da3a495a..93fd0164a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ - -dist: trusty +# The current Travis default is a VM based 16.04 Xenial on GCE +# Additional builds with specific requirements for a full VM need to +# be added as additional matrix: entries later on +dist: xenial language: c -python: - - "2.6" compiler: - gcc cache: ccache @@ -34,7 +34,7 @@ addons: - libssh2-1-dev - liburcu-dev - libusb-1.0-0-dev - - libvte-2.90-dev + - libvte-2.91-dev - sparse - uuid-dev - gcovr @@ -193,9 +193,7 @@ matrix: apt: packages: - python3-pip - - python3.4-venv - - + - python3.5-venv # Using newer GCC with sanitizers - addons: apt: @@ -229,7 +227,7 @@ matrix: - libssh2-1-dev - liburcu-dev - libusb-1.0-0-dev - - libvte-2.90-dev + - libvte-2.91-dev - sparse - uuid-dev language: generic From patchwork Mon Jan 14 15:01:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 10762977 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2C08891E for ; Mon, 14 Jan 2019 15:38:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1DE63290B7 for ; Mon, 14 Jan 2019 15:38:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 11FD8290FA; Mon, 14 Jan 2019 15:38:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B4D39290B7 for ; Mon, 14 Jan 2019 15:38:02 +0000 (UTC) Received: from localhost ([127.0.0.1]:55806 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj4JO-0004vn-0h for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Jan 2019 10:38:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37545) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3tL-0007gq-0g for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:11:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj3tJ-0001GT-8r for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:11:06 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:55567) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj3tJ-0001Bw-1T for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:11:05 -0500 Received: by mail-wm1-x334.google.com with SMTP id y139so9206837wmc.5 for ; Mon, 14 Jan 2019 07:11:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=blF+oECWlv4JSyBXHgv9a0FA1ch/QgkqQkRMhWFKj3o=; b=iTZZQj2AVVb2E7FtLaiszMa9aqguuv3FfnrdBLIu10qXL9q65v0xCK3aMlIaqK8hmw D/ItedRlhacNgqlSIypwhrdAdTbIT/hz6i+EUFEVTQQu9gPHAm9EMVN6RNxkVz8lwvE6 fUMMHLDuuEndv9KSRfBImdGlbCfmzsASM1C/c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=blF+oECWlv4JSyBXHgv9a0FA1ch/QgkqQkRMhWFKj3o=; b=Ybh5liDZXyQgn64lsco7ZilW93tuV18EI1jMyraTJOQyum4yFSR7Aw1EB8P996A2FE jVr9doyt2Q3U44821JYCKdDNw0wUpk9wrsjCL1ZkuYXYZx3jhq4AS+RzJQ6/2Pj507CG XB78EdJaGWftxWxlRsLZ8LAPGL97tY8uKoJjpWcyeyIIdxHf1D0v4b3libfCzSsaGMZ5 LYXcVO2l/TCQqwvOFhOZgbCcfcjRF8BfddanEPOr3D6UranuKiWAZ8ZOTxkYrU7iGAs1 JzSeT8KCgGFpasNXhvPAOF0Swk3ryDcxBQxAbfhFWEen4CmjJ8gd8n+kUbaWIe3lD2u4 3XlQ== X-Gm-Message-State: AJcUukcyH63epDL5qfjL30XVSU2glikxP+KS0w7P2OOvEt9Y7E/gDBpR jFIOiM7JCm+X1D5kbzBt8RKqKQ== X-Google-Smtp-Source: ALg8bN6Md4DylA4cB+fRmzLhf0chUOiudTlfuT4pxvkW3w2RjNOMmAzcjWD1DeClB1hGiXoywEDDIg== X-Received: by 2002:a1c:7dd7:: with SMTP id y206mr12186629wmc.50.1547478659837; Mon, 14 Jan 2019 07:10:59 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v12sm47943270wmd.27.2019.01.14.07.10.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jan 2019 07:10:58 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 5983C3E12A8; Mon, 14 Jan 2019 15:01:31 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 14 Jan 2019 15:01:26 +0000 Message-Id: <20190114150129.1013-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114150129.1013-1-alex.bennee@linaro.org> References: <20190114150129.1013-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::334 Subject: [Qemu-devel] [PULL 18/21] tests/docker: update our Travis image 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: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP We are now using Xenial based images on Travis so we should make the same one available as our qemu:travis docker image. Signed-off-by: Alex Bennée diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfiles/travis.docker index 46cf367488..e72dc85ca7 100644 --- a/tests/docker/dockerfiles/travis.docker +++ b/tests/docker/dockerfiles/travis.docker @@ -1,4 +1,4 @@ -FROM travisci/ci-garnet:packer-1512502276-986baf0 +FROM travisci/ci-sardonyx:packer-1546978056-2c98a19 ENV DEBIAN_FRONTEND noninteractive ENV LANG en_US.UTF-8 ENV LC_ALL en_US.UTF-8 From patchwork Mon Jan 14 15:01:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 10762929 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8B04F17FB for ; Mon, 14 Jan 2019 15:15:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7AA88292F0 for ; Mon, 14 Jan 2019 15:15:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 76D74292A8; Mon, 14 Jan 2019 15:15:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 159E328FD5 for ; Mon, 14 Jan 2019 15:15:13 +0000 (UTC) Received: from localhost ([127.0.0.1]:50695 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3xI-0002XO-9E for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Jan 2019 10:15:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3kH-0006M6-QB for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj3kE-0005Nt-2t for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:45 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:42504) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj3kD-0005Mi-TC for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:42 -0500 Received: by mail-wr1-x430.google.com with SMTP id q18so23195065wrx.9 for ; Mon, 14 Jan 2019 07:01:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6GEkLQ4o0gKxuajoQY65sRID7MjPc6KQZ55vadSyjAo=; b=dE/2emqmqgJ0iDsw2i3AEJlnmyQUpVqZAEsUGbbPeiGtDdsr/6cnrW2neQMj6PXQgy VGEkG0EZFsitis+fzBD5fyKSW2+mtJFfd5fhZVZN6fK4E2jpmL6tSjejnI6iHQwb5vTH zF59E3IA1mW2KIZgUBTgI0riZTE4uQn5n6KgA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6GEkLQ4o0gKxuajoQY65sRID7MjPc6KQZ55vadSyjAo=; b=VsRX6VGGJ3KlHmMdXRU3N/+HXd1q9iKt6xByJ/ZNdRlL0XsMZATXK0HBkshijSF52w Dl16lRufJXJnv4sSmHzTVYhUodCZ6dswJKFQ0f220NT2td54sDVZcBhtXCVUfuCOTTyk /bBXUyYjRMbM+2kd3nFeWuC+YbCcfGRGZyLTg/LbVLsND0cmFuy+c/l5A8aMgPbaJdRY p5KAvZ3UgE234cVwCvdsAGhXavCF7fK+5l4kNuaaO0PZjR33vUbJOSOUqAWi+wGX2vgA VwQYM3QWzPcwGP8jy2k7AIxNz64RFyjCne573U0kw+EQWgDYh9i5Gd/WHraOiN6ULEfE xQNg== X-Gm-Message-State: AJcUuke025ZN2c3n9/REMmmnvCAau9KJkEpqsfoelCzt0RTzDX5talSL OJrw4CqMmR9fRWj6wZt0UMBaRQ== X-Google-Smtp-Source: ALg8bN4YoKkNQgxLP2lTN0DVM62fjAFQfcixXtNkcQZFy4gtQ4sO0n2pgbc+zeupa3Bop9mVU6Zuwg== X-Received: by 2002:adf:80a9:: with SMTP id 38mr23253173wrl.137.1547478100922; Mon, 14 Jan 2019 07:01:40 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id m21sm24706530wmi.43.2019.01.14.07.01.35 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jan 2019 07:01:37 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 6DDB43E12B0; Mon, 14 Jan 2019 15:01:31 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 14 Jan 2019 15:01:27 +0000 Message-Id: <20190114150129.1013-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114150129.1013-1-alex.bennee@linaro.org> References: <20190114150129.1013-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::430 Subject: [Qemu-devel] [PULL 19/21] tests/docker: remove SID_AGE test hack 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: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Now we are using "named" snapshots of debian-sid we can rely on the existing checksum mechanism for detecting changes. Signed-off-by: Alex Bennée diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 9467e9d088..7032c68895 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -98,19 +98,6 @@ docker-image-debian-s390x-cross: docker-image-debian9 docker-image-debian-win32-cross: docker-image-debian8-mxe docker-image-debian-win64-cross: docker-image-debian8-mxe -# Debian SID images - we are tracking a rolling distro so we want to -# force a re-build of the base image if we ever need to build one of -# its children. -ifndef SKIP_DOCKER_BUILD -ifeq ($(HAVE_USER_DOCKER),y) -SID_AGE=$(shell $(DOCKER_SCRIPT) check --checktype=age --olderthan=180 --quiet qemu:debian-sid) -ifeq ($(SID_AGE),) -else -docker-image-debian-sid: NOCACHE=1 -endif -endif -endif - docker-image-debian-alpha-cross: docker-image-debian-sid docker-image-debian-hppa-cross: docker-image-debian-sid docker-image-debian-m68k-cross: docker-image-debian-sid From patchwork Mon Jan 14 15:01:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 10762901 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6B0DC1390 for ; Mon, 14 Jan 2019 15:07:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5AECB28FA5 for ; Mon, 14 Jan 2019 15:07:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4EE1528FBE; Mon, 14 Jan 2019 15:07:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EA1CA28FA5 for ; Mon, 14 Jan 2019 15:07:16 +0000 (UTC) Received: from localhost ([127.0.0.1]:48771 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3pc-0004By-7U for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Jan 2019 10:07:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3kF-0006K0-UD for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj3kF-0005PK-3Q for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:43 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:43460) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj3kE-0005O9-Qu for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:42 -0500 Received: by mail-wr1-x42f.google.com with SMTP id r10so23213786wrs.10 for ; Mon, 14 Jan 2019 07:01:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eJxeslcAF4iyKuUEJ3/FZIaxt6VIaQGDo/07LFcW7Gw=; b=AdQB40PvbcEe8Vl3io3QssH+e2SaJPs/nhz+tGog/S6J22myJDuEzPuWwmzvhEgLOV PhuJ1okvZd7hAgViq0avhCREjF5BMQV37uUheAZJfeAgdKX9l29Q0kQpDBZGwZJivCcq bni2AR3taG01Oxc6YbIqwdb4VQvEUVMZP4CaE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eJxeslcAF4iyKuUEJ3/FZIaxt6VIaQGDo/07LFcW7Gw=; b=tFQOEwAvJImW4wcRLFeS97JfYIdr6qdEdInin1nN/uMLFpYYwBVMBGngleigX1SCj2 fsbQbcxt/lucGBuBot3h91kTGj0rKLcAmNz3d357/omPduGchNP+KDAWQX464//DLGNi FP4AsnfHqzxlywFZHfKmnGpw1y7ExnDmDR60+tP2keBHu7J2BrjxFlWuGroyuITetOVf ScRTVqdfp9xeB/QtDpWLl1gaJOUU1YAtYffqaHx8p0/+2hTM6/2VThbBltRnpJi4s4V9 WqrcUPo0hl/skXh03J8YQGlFqOQR247cwltCycWmPZG7jMoamlsno/d1TO4jefyzSXdL 1yyA== X-Gm-Message-State: AJcUukf/Qu12gsTWQ58lJs4YZC4Jhh9JXJupN4zR6tW8VpxiNBHkQfcT RgRFM9lt0/BqHa1f5jKKjlPTIQ== X-Google-Smtp-Source: ALg8bN5O4nkd0dIwEenXvehFHvPC6/ngA0yrTTsp5wm1vcdeURg1RnwenzlStExJgZEfxHS2ltJBlg== X-Received: by 2002:adf:dec4:: with SMTP id i4mr23813489wrn.307.1547478101737; Mon, 14 Jan 2019 07:01:41 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id k135sm31796223wmd.42.2019.01.14.07.01.35 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jan 2019 07:01:38 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 84FE53E059D; Mon, 14 Jan 2019 15:01:31 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 14 Jan 2019 15:01:28 +0000 Message-Id: <20190114150129.1013-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114150129.1013-1-alex.bennee@linaro.org> References: <20190114150129.1013-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42f Subject: [Qemu-devel] [PULL 20/21] tests: use g_usleep instead of rem = sleep(time) 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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Relying on sleep to always return having slept isn't safe as a signal may have occurred. If signals are constantly incoming the program will never reach its termination condition. This is believed to be the mechanism causing time outs for qht-test in Travis. The glib g_usleep() deals with all of this for us so lets use it instead. Signed-off-by: Alex Bennée Reviewed-by: Peter Maydell diff --git a/tests/atomic64-bench.c b/tests/atomic64-bench.c index 71692560ed..121a8c14f4 100644 --- a/tests/atomic64-bench.c +++ b/tests/atomic64-bench.c @@ -74,16 +74,14 @@ static void *thread_func(void *arg) static void run_test(void) { - unsigned int remaining; unsigned int i; while (atomic_read(&n_ready_threads) != n_threads) { cpu_relax(); } + atomic_set(&test_start, true); - do { - remaining = sleep(duration); - } while (remaining); + g_usleep(duration * G_USEC_PER_SEC); atomic_set(&test_stop, true); for (i = 0; i < n_threads; i++) { diff --git a/tests/atomic_add-bench.c b/tests/atomic_add-bench.c index 2f6c72f63a..5666f6bbff 100644 --- a/tests/atomic_add-bench.c +++ b/tests/atomic_add-bench.c @@ -76,16 +76,14 @@ static void *thread_func(void *arg) static void run_test(void) { - unsigned int remaining; unsigned int i; while (atomic_read(&n_ready_threads) != n_threads) { cpu_relax(); } + atomic_set(&test_start, true); - do { - remaining = sleep(duration); - } while (remaining); + g_usleep(duration * G_USEC_PER_SEC); atomic_set(&test_stop, true); for (i = 0; i < n_threads; i++) { diff --git a/tests/qht-bench.c b/tests/qht-bench.c index ab4e708180..e3b512f26f 100644 --- a/tests/qht-bench.c +++ b/tests/qht-bench.c @@ -398,16 +398,14 @@ static void pr_stats(void) static void run_test(void) { - unsigned int remaining; int i; while (atomic_read(&n_ready_threads) != n_rw_threads + n_rz_threads) { cpu_relax(); } + atomic_set(&test_start, true); - do { - remaining = sleep(duration); - } while (remaining); + g_usleep(duration * G_USEC_PER_SEC); atomic_set(&test_stop, true); for (i = 0; i < n_rw_threads; i++) { From patchwork Mon Jan 14 15:01:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 10762963 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 390E11390 for ; Mon, 14 Jan 2019 15:31:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B26129470 for ; Mon, 14 Jan 2019 15:31:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 24AA929493; Mon, 14 Jan 2019 15:31:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AC2C529482 for ; Mon, 14 Jan 2019 15:31:04 +0000 (UTC) Received: from localhost ([127.0.0.1]:54235 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj4Cd-0006EH-RF for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Jan 2019 10:31:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37501) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3tJ-0007fd-Ml for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:11:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj3tJ-0001GC-1B for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:11:05 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:36263) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj3tI-0001FM-Qu for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:11:04 -0500 Received: by mail-wr1-x434.google.com with SMTP id u4so23286296wrp.3 for ; Mon, 14 Jan 2019 07:11:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9RpNup5xciVDKPXXK6RwjiRM1jJYFhJ3OVq4pU/9sk0=; b=ipDf0r1DwJmr61Epc8bT1JsmyDWGCODVKlWoYu1hn97t5NjUz+sIZNg2ajEHhg4KSd Hir732L3p9uo7HyofLEvgq1A9ifMXtEgHW5lW9NbcsmYXu46rz9K2YQ1Q7eqMH0OtFQO jiq47oYY9TV0ijYob/Uxk5fjFvIko63Pvs53Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9RpNup5xciVDKPXXK6RwjiRM1jJYFhJ3OVq4pU/9sk0=; b=FI8BOLxxOFIyyLO3Yg4ZNDJ5IdbuLptvSP1yNBzQnZ5tij9cX69MrSLPK0NrqvGO+t SFshtGTsHDDvMtCueB0RwsvRoLwzb7Eezh/5/+IK0CGKVikiAIDU8FThtiPMwkWu6F1t DjZ1OWKIK6Xn0f/GfwReKHs/LbrI1f+Q81l9FP8PrakTeocW25J/MhhFxTbjiRV7YIdZ EasLjAr55C2hgYmoFBQIvmv1pKIz05Zgc8JudMfkfJJ4OYeoFE52W0jGDc1DLIWCdaXO koUCtnJpL5J7ricSC5XoZShmeNTwjFjACPwTvIoQkh6PkbakwZVgyVD7M1Dp9Hs7y3bB QMDg== X-Gm-Message-State: AJcUukcgSNEpCzcNRRtMdlC/f+GNSHhVQc8KX2wGIiDide8vsqMcTqb7 abA2X2LteV2TjYG9msYGEDrIFA== X-Google-Smtp-Source: ALg8bN4VDrni8jPGZfWHsnx1Unt1C5/KCA3iEcMPgmR6GpPv6Rc7eEUV0+AtSv8R3VMHo5DNJE+KVg== X-Received: by 2002:adf:db01:: with SMTP id s1mr23979274wri.214.1547478663326; Mon, 14 Jan 2019 07:11:03 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id f14sm69702202wrv.56.2019.01.14.07.10.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jan 2019 07:11:02 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 98EA93E12FF; Mon, 14 Jan 2019 15:01:31 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 14 Jan 2019 15:01:29 +0000 Message-Id: <20190114150129.1013-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114150129.1013-1-alex.bennee@linaro.org> References: <20190114150129.1013-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 Subject: [Qemu-devel] [PULL 21/21] Revert "tests: Disable qht-bench parallel test when using gprof" 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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This reverts commit ce2eefd7c21697fee87a0686353de881081d22c6. The underlying cause was fixed with eb4f8e100f. Signed-off-by: Alex Bennée diff --git a/configure b/configure index 4ea3f14883..f59d484f7a 100755 --- a/configure +++ b/configure @@ -7487,7 +7487,6 @@ alpha) esac if test "$gprof" = "yes" ; then - echo "CONFIG_GPROF=y" >> $config_host_mak echo "TARGET_GPROF=y" >> $config_target_mak if test "$target_linux_user" = "yes" ; then cflags="-p $cflags" diff --git a/tests/Makefile.include b/tests/Makefile.include index 601ef4f64c..f403a6571d 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -88,8 +88,7 @@ check-unit-y += tests/test-rcu-simpleq$(EXESUF) check-unit-y += tests/test-rcu-tailq$(EXESUF) check-unit-y += tests/test-qdist$(EXESUF) check-unit-y += tests/test-qht$(EXESUF) -# FIXME: {test-qht-par + gprof} often break on Travis CI -check-unit-$(call lnot,$(CONFIG_GPROF)) += tests/test-qht-par$(EXESUF) +check-unit-y += tests/test-qht-par$(EXESUF) check-unit-y += tests/test-bitops$(EXESUF) check-unit-y += tests/test-bitcnt$(EXESUF) check-unit-y += tests/test-qdev-global-props$(EXESUF)