From patchwork Tue Jul 24 10:50:53 2018 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: 948368 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="S5CSqKTO"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41ZZtV6NHgz9s0R for ; Tue, 24 Jul 2018 20:52:02 +1000 (AEST) Received: from localhost ([::1]:39441 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhuv9-0000sR-HU for incoming@patchwork.ozlabs.org; Tue, 24 Jul 2018 06:51:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59995) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhuuT-0000rl-OF for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhuuP-0006P9-5D for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:17 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:55762) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fhuuO-0006Of-Um for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:13 -0400 Received: by mail-wm0-x243.google.com with SMTP id f21-v6so2054848wmc.5 for ; Tue, 24 Jul 2018 03:51:12 -0700 (PDT) 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=X36oS78zfBJMw3mbG9cGucwrrsd+JXGCZ49duYbIC7w=; b=S5CSqKTO9YjKIkczu23p9foyAaZcuplK09h5iMFHXG5dMLR4oINsVicB0Ugd67yctO vBi48Sg6VazImCiyCPnMzovlPpo2Q1G7BNcys++J+2LWjNHRKU96XHNoRDc1LmB3pd90 kSnyHme4GwdWLgf3M2lZfNzfVzAsLlFNjZtUQ= 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=X36oS78zfBJMw3mbG9cGucwrrsd+JXGCZ49duYbIC7w=; b=eBXwnyygjmg5y2PBVtWNTTeKoKoTLknICpiFII+Xlik36paZQ1rQ8INdk993ansNPB kiS8aJdGt77ZO+s4JDZpDoDQdbGY94RMoYrn7l2QCFtrQi+l1LEXhAwAj95S8Bhq90pV qPzG2NG5KXszL1nhVRinG3M3FadGINFDAKJHAJaMtBmiedrTPK0WTEeoE+ehQS8YKXpW J4qLc+yH4IpWrkaFeMLp+CIwgE+XPZE9F2TwVyze7TMqzNm+Xj8aBGviFNWF/pJQMxfQ P4s4hikKOU8d69tLMmvLFAbgZZ8lgaN8wZuWWukEVGBJ2uvxwxxFgzdlMiuQrpHblPfl 2zQA== X-Gm-Message-State: AOUpUlEMj6ZhbCMKnW7+LuGGjT6Q65qtIPvbNGlNAxDZ1YGuYBqmD0hs F7NwO1ydsf6ZITzRWsCh+JhQHw== X-Google-Smtp-Source: AAOMgpciBN0GGaKdiZ7iDf1SLA/NYmKNzs8aumoVsiejiAE6B+EXUrmdurY63mZfPrsY//E0TucNWA== X-Received: by 2002:a1c:9d02:: with SMTP id g2-v6mr1514193wme.122.1532429471824; Tue, 24 Jul 2018 03:51:11 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r1-v6sm10266566wrs.39.2018.07.24.03.51.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jul 2018 03:51:10 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id EEEF93E0530; Tue, 24 Jul 2018 11:51:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 24 Jul 2018 11:50:53 +0100 Message-Id: <20180724105109.8392-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180724105109.8392-1-alex.bennee@linaro.org> References: <20180724105109.8392-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:400c:c09::243 Subject: [Qemu-devel] [PULL 01/17] tests/.gitignore: don't ignore docker tests X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The .gitignore was being a little over enthusiastic hiding files. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/.gitignore b/tests/.gitignore index 08e2df1ce1..72c18aaab0 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -9,6 +9,7 @@ qht-bench rcutorture test-* !test-*.c +!docker/test-* test-qapi-commands.[ch] test-qapi-events.[ch] test-qapi-types.[ch] From patchwork Tue Jul 24 10:50:54 2018 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: 948377 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Py5XZGyV"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41ZZxm4zCwz9s2M for ; Tue, 24 Jul 2018 20:54:52 +1000 (AEST) Received: from localhost ([::1]:39452 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhuxs-00039N-Mj for incoming@patchwork.ozlabs.org; Tue, 24 Jul 2018 06:54:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60006) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhuuU-0000rn-0q for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhuuQ-0006Pe-Hh for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:18 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:36755) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fhuuQ-0006PK-B3 for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:14 -0400 Received: by mail-wm0-x243.google.com with SMTP id s14-v6so2074060wmc.1 for ; Tue, 24 Jul 2018 03:51:14 -0700 (PDT) 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=f1Vod/g0yZrjCxGs1Rcc1Umm6mavuaDiYRWcDUb1fHs=; b=Py5XZGyVQhmFzDM+qKboK7dGaw+g6Ac9rz0L7poiCL4XsulIGL+Tn+cOM0Rvw4EiTS Kpfw7v9wapujcRmaZvB3MRzOz/8rEk13rdeT89YFWPK/6Myfv8+omuC64BiGaijgdZD3 yOE7kAsycU+FUI3gAP3ESzDkoirfI53jpBCJ4= 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=f1Vod/g0yZrjCxGs1Rcc1Umm6mavuaDiYRWcDUb1fHs=; b=VUyPlAewp7R6N9bSKOQOsExLgQnj0kFZLOusS8Y0yD0Rjwoe1o3uoXwhcJq+lUcrpO 5AgSWl1wHQn0dV4ymEylvMdA6+y2FM5zgQToGN6Rew0aJgMumYTYaML/dSrhHX9qi8fE JAuKyhpIMNoGX7xbHMiijU+ZKb0DcM+hjICgUfWjwj7FdL8UD00kEHbDM8j0AaokoP3W NbNLghKIcd0wdRRwq8K43osT5QIa+1CkpJwH/o4udw5EYcVJC/lFvPLWGNl2IbU++NSl lEjsfSsJV5nFoWUekjoDE1n7vZgSua7AWYPjh+yL7A8AHuOTSLKdMP0iNp960ACRKnUG K2sQ== X-Gm-Message-State: AOUpUlGrl4n7ZHvFnlvIY7Uqt9TsDMp8hoWrGBCWJmTOIsNKkcqvmgoD UkzIxUvJC+z2d6lBCNwc+TnoHA== X-Google-Smtp-Source: AAOMgpfkEd3DiBYKlD3y84vwHl4B3IiyskV6g3IinZc7EKjOA6B3+0x4+PP9/0eFe8SA2MYGN2Obsw== X-Received: by 2002:a1c:dcf:: with SMTP id 198-v6mr1643219wmn.131.1532429473124; Tue, 24 Jul 2018 03:51:13 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r12-v6sm1767372wmc.27.2018.07.24.03.51.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jul 2018 03:51:11 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 0D0303E053B; Tue, 24 Jul 2018 11:51:10 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 24 Jul 2018 11:50:54 +0100 Message-Id: <20180724105109.8392-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180724105109.8392-1-alex.bennee@linaro.org> References: <20180724105109.8392-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:400c:c09::243 Subject: [Qemu-devel] [PULL 02/17] docker: base debian-tricore on qemu:debian9 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We need both git and a working compiler to build the tools. Although the qemu:debian9 image also has a bunch of extra dependencies it would be fairly unusual for a user not to already have this layer available for one of our many other docker images so lets not complicate things. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker index 898b8dd511..180ca646c8 100644 --- a/tests/docker/dockerfiles/debian-tricore-cross.docker +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker @@ -7,7 +7,7 @@ # # SPDX-License-Identifier: GPL-2.0-or-later # -FROM debian:9 +FROM qemu:debian9 MAINTAINER Philippe Mathieu-Daudé From patchwork Tue Jul 24 10:50:55 2018 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: 948369 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="EuAzQAvc"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41ZZtX1HkZz9s29 for ; Tue, 24 Jul 2018 20:52:04 +1000 (AEST) Received: from localhost ([::1]:39443 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhuvB-0000t6-QR for incoming@patchwork.ozlabs.org; Tue, 24 Jul 2018 06:52:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60005) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhuuU-0000rm-04 for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhuuR-0006Q7-Ce for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:18 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:37458) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fhuuR-0006PY-4K for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:15 -0400 Received: by mail-wr1-x42d.google.com with SMTP id q10-v6so3663367wrd.4 for ; Tue, 24 Jul 2018 03:51:14 -0700 (PDT) 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=RD0bAg8J8gtqQZW/++n04gdsLDBE4CQeW0DEmub/COU=; b=EuAzQAvc7zfwH7J8CbZqcle7Qyc80+9ZYiQZXPwD1t2LSkGHsAQn+0+8w/3++Gz2tr S+9T+79vfiRyLwHtXzEeKj68Faj4VRe/mA2ki5SX5LARgWWhKsYH+KeMHp/f1YdrcKfd BAbs2sHv5OmDyeLCmua38P4LsFB4TZnPy6Wl8= 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=RD0bAg8J8gtqQZW/++n04gdsLDBE4CQeW0DEmub/COU=; b=tC3Ury5hQUxAUaHJMeaP3dP7dbJGbSYzfzkQhSeQDoxnuuEpGSHSeHlfed1txnvnut bOTX0mJABwR344XW117Ftv9B3KHgI0ouowSAHF633R90i1fe0G4K6HQRXIoboce19Bk7 dcnE2gndvzjLEwkZvhGy49A9wJHfLReS/wvIPV4KX3sxsB88L+ZzBPjjbvSHuaAnQpvB kpJnOtEWwLY9Wu8pVhQ8wRmOvC1let3vJfDIxeOn2pwwhfUAUlj7997s6PGQ4Shff+km t9JVXGQMZnzlGj2B/vbMA3hm4D2mDrPsqfNyrrF/pq8RaEvzAoblaDwyopGyT73vKjKQ lSaA== X-Gm-Message-State: AOUpUlE2bE/zFcOl63ED8+xIf3EuJXf7O115bTT2qN5aTWrEH/mrAjuQ 7VsF+Jd3O9CIa5nmE3PKBuYZYQ== X-Google-Smtp-Source: AAOMgpf/4S4TSiRpgiGgo8IrTOoZBaF84bIwfsr1syMAi4V4kuBOyZV/tqmnAFxVMK92+TPkOFoVNw== X-Received: by 2002:a5d:6550:: with SMTP id z16-v6mr10984599wrv.194.1532429474004; Tue, 24 Jul 2018 03:51:14 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v5-v6sm14772480wrp.87.2018.07.24.03.51.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jul 2018 03:51:11 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 1F9B83E053E; Tue, 24 Jul 2018 11:51:10 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 24 Jul 2018 11:50:55 +0100 Message-Id: <20180724105109.8392-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180724105109.8392-1-alex.bennee@linaro.org> References: <20180724105109.8392-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::42d Subject: [Qemu-devel] [PULL 03/17] docker: par down QEMU_CONFIGURE_OPTS in debian-tricore-cross 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This image isn't going to build anything significant as it is just intended for building test cases. In case it does end up getting inadvertently included in a build lets aim for the minimal possible product. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker index 180ca646c8..4a0f7706a3 100644 --- a/tests/docker/dockerfiles/debian-tricore-cross.docker +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker @@ -19,5 +19,5 @@ RUN git clone --single-branch \ make && make install && \ rm -rf /usr/src/binutils -# Specify the cross prefix for this image (see tests/docker/common.rc) -ENV QEMU_CONFIGURE_OPTS --cross-prefix=tricore- +# This image isn't designed for building QEMU but building tests +ENV QEMU_CONFIGURE_OPTS --disable-system --disable-user From patchwork Tue Jul 24 10:50:56 2018 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: 948380 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="FAXjxCWY"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Zb0t4fSqz9s29 for ; Tue, 24 Jul 2018 20:57:34 +1000 (AEST) Received: from localhost ([::1]:39470 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhv0V-0005xP-Lo for incoming@patchwork.ozlabs.org; Tue, 24 Jul 2018 06:57:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60013) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhuuU-0000rp-2J for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhuuS-0006QO-4j for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:18 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:40751) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fhuuR-0006Py-UU for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:16 -0400 Received: by mail-wr1-x431.google.com with SMTP id t6-v6so3653842wrn.7 for ; Tue, 24 Jul 2018 03:51:15 -0700 (PDT) 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=nEc74mCO7Slzbvsmn7eL5AKEB4COr192uF8yOdw9aaM=; b=FAXjxCWYWoIRwrQjYmO50b3CG1X2JX5enNyUCRCFJuWIzUeBGr2bdd5g8zBmnenpIw rMLXapAl3gYTWEdM/q7FQYIr04M7YZ3rzFOMll0l3a6RaIEi+BztpCV+CwSgEzc3hxnB if+HF9M12U+emfrsAvhimyir1fjK3/P3OeyEc= 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=nEc74mCO7Slzbvsmn7eL5AKEB4COr192uF8yOdw9aaM=; b=exhocd2EGPWe3VYJlUUww6qP77sDS5QWid6mxer+hEjYoj9cAjcQnCh0PnsEmasiyT kXZi+eFTC9nWsWTGCS6QbEdOBg0zZi4pnFZz5ugVQXP5vaZomUx+iN0crIGBOrUkBkgH lPclcbTqudPHdr45oQ5Ybut0lYsWySSrgWe+wwom7ey9QDyELpf04WU3ISIy/q9UJI4e 9UE5yqVl9w3bbpbqDTqqrwR5GCPmTFuy4t+/rotKP2nlPbhhjSs31bH4dY9YwtWtwsYv /yMxqFGWGFSc0tE7MnWip3NKUkcSa9KecNTKFmuGDLRGz3RoBLapAOPSKUKXYLYcQBoY +fYA== X-Gm-Message-State: AOUpUlF/c8li8ydEbFBy7ryjV0BcRZ5qnD7YVCQS+875gzzQk3+3W9sU TOHeMOOD0JW9gu4q/0cSFKt4oQ== X-Google-Smtp-Source: AAOMgpesdg91ILWavvtC9JvFT93yAZlz97LMoljPMK30/WTzkUafwyZN9hO9XtP4Uc6A5V90sWVXVQ== X-Received: by 2002:a5d:6892:: with SMTP id h18-v6mr11132016wru.108.1532429474804; Tue, 24 Jul 2018 03:51:14 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id e12-v6sm9652484wrt.29.2018.07.24.03.51.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jul 2018 03:51:11 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 32A843E056A; Tue, 24 Jul 2018 11:51:10 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 24 Jul 2018 11:50:56 +0100 Message-Id: <20180724105109.8392-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180724105109.8392-1-alex.bennee@linaro.org> References: <20180724105109.8392-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 04/17] docker: fail more gracefully on docker.py check 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" As this is called directly from the Makefile while determining dependencies and it is possible the user was configured in one window but not have credentials in the other. Let's catch the Exceptions and deal with it quietly. Signed-off-by: Alex Bennée Reported-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 69e7130db7..2f81c6b13b 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -479,7 +479,12 @@ class CheckCommand(SubCommand): def run(self, args, argv): tag = args.tag - dkr = Docker() + try: + dkr = Docker() + except: + print("Docker not set up") + return 1 + info = dkr.inspect_tag(tag) if info is None: print("Image does not exist") From patchwork Tue Jul 24 10:50:57 2018 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: 948370 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="chY/q8q0"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41ZZtX6TzDz9s0R for ; Tue, 24 Jul 2018 20:52:04 +1000 (AEST) Received: from localhost ([::1]:39442 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhuvA-0000sV-QY for incoming@patchwork.ozlabs.org; Tue, 24 Jul 2018 06:52:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60007) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhuuU-0000ro-0z for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhuuT-0006Qj-0i for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:18 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:37460) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fhuuS-0006QM-Oy for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:16 -0400 Received: by mail-wr1-x42f.google.com with SMTP id q10-v6so3663442wrd.4 for ; Tue, 24 Jul 2018 03:51:16 -0700 (PDT) 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=CryDkbZBQiYQ0RAme8ENjWqCxx8EiBJC8jPvCqj5j/A=; b=chY/q8q0QG66f9As10fMVDTwWzec/0fBwqLmKjkptX09P4R7aKRWXqTy+E9UnMn7MJ EeJljDAuKYKTQM54GvecZuIwdLkj5z5YO08cjicJaOT1vih9vNw3u47zTwVGxo4xoH7D BSxaxbgB2zye//P3hfNgw8DijzCmUD1Q1STo0= 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=CryDkbZBQiYQ0RAme8ENjWqCxx8EiBJC8jPvCqj5j/A=; b=Ox/ccPW2yQDHnuhtivTVlGgyM3tsA8ER95BSg1BojHdQxs6XfLwIOiWWwRmARJsdR0 WUEFWpbmz1Bt6P9pPiWw6QN37MUuWMYvpLRug/YzoaD0QFiBNE04vjaAobpglr192gpY qPBZdhlUYQ+/H0dOqhXnG5CgsnzLjhtWEsmMWUMCZ10sAggLC3tG0FdqsXhj1sNXgvjU xQv8FV6gFCJycnkrPcnYYwBlsZmOgif5/4xNBYu5dNFLcNJXNPV5YHnK8W7/GstXz7Jk eODOAuIKnW2/6NL86+PrrvBTmgI5mUTW+dAApMgrYXyHX55d6xA9hk8KRIfdDZjlUpvn Jsxw== X-Gm-Message-State: AOUpUlE0gfo02OhwGJGUlC6C6H5HBpUyG6AcXMufTeX5tBQMt/UN0g+I RJt2f8n6bkcXdGGmeLvMcpnWOg== X-Google-Smtp-Source: AAOMgpfrSbU7ZAgs5n8qa4xgP6Q5CiD945eDNUhiX0G0gc2e/9eP9jholQa79A5Tro5F7GCcy2vO/g== X-Received: by 2002:adf:d142:: with SMTP id b2-v6mr10973560wri.17.1532429475644; Tue, 24 Jul 2018 03:51:15 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id w8-v6sm1558580wra.7.2018.07.24.03.51.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jul 2018 03:51:11 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 4506E3E061C; Tue, 24 Jul 2018 11:51:10 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 24 Jul 2018 11:50:57 +0100 Message-Id: <20180724105109.8392-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180724105109.8392-1-alex.bennee@linaro.org> References: <20180724105109.8392-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 05/17] docker: split configure_qemu from build_qemu 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This allows some tests that just want to configure QEMU's source tree to do so. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/common.rc b/tests/docker/common.rc index 046f8a5921..ba1f942328 100755 --- a/tests/docker/common.rc +++ b/tests/docker/common.rc @@ -21,7 +21,7 @@ requires() done } -build_qemu() +configure_qemu() { config_opts="--enable-werror \ ${TARGET_LIST:+--target-list=${TARGET_LIST}} \ @@ -32,6 +32,11 @@ build_qemu() echo $config_opts $QEMU_SRC/configure $config_opts || \ { cat config.log && test_fail "Failed to run 'configure'"; } +} + +build_qemu() +{ + configure_qemu $@ make $MAKEFLAGS } From patchwork Tue Jul 24 10:50:58 2018 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: 948371 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="fZQaD/wX"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41ZZtc36lDz9s0R for ; Tue, 24 Jul 2018 20:52:08 +1000 (AEST) Received: from localhost ([::1]:39444 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhuvE-0000vR-Vf for incoming@patchwork.ozlabs.org; Tue, 24 Jul 2018 06:52:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60042) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhuuV-0000s7-Gu for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhuuU-0006RY-62 for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:19 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:40457) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fhuuT-0006Qx-Ta for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:18 -0400 Received: by mail-wr1-x441.google.com with SMTP id t6-v6so3653925wrn.7 for ; Tue, 24 Jul 2018 03:51:17 -0700 (PDT) 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=+pe6j9bzOj5I4gXcwzbYdbHIcfj1wXvLg53uu7KEQGE=; b=fZQaD/wXtEOvePzWAJMyFqH3qTDmoDensstXUc74wsr+zB+97GQSERtFA1EWSRuz9y Jv3A2LFWZHzw7N8qChLMpyHso0IJ47moGmjqd0utin8DsdD0IUn1eISC6HhFW+cNXFOv +sKbfXmp4biZcK9ZD6pTULxdnOen7VIsdo0B8= 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=+pe6j9bzOj5I4gXcwzbYdbHIcfj1wXvLg53uu7KEQGE=; b=TxzPzZoLVl3rT9GnNVEUszvsAi6hpp/fDSV2lanI+5iPnQMzNsK+Q/mNSdTfXJgdsT 0DypwJWFFNZ/yCeK5B8uk0Lvfx119QybVmbFd5e/+kYNDXsYWTY3IVOLto/8opHsG6rP UAaGHQxTlGcksdR7NV7Kq2nragpVMeZGU9zj5G7vwqvR6QM8+owQGVFE4Fk+DqUtJoK5 ygm+4BmFOxgGpVGlhm5aF1zzQG/ynd1KTlGHCXAOsCJxl3o/7J0yBFg0l2Sjnoy+zp83 9LIUSd6LosSdkS7UtFW3pSzScWka6q3aIZ8qxL+40iT5wFPrWGyVX5Pfqezi3pSlRvC+ bT+w== X-Gm-Message-State: AOUpUlHJ367CoPMLTnTKPCwD7eocgBIaie3EGNchYN17DV81ZFBgweLa R8WSg6ss7i5ZSHOOcVEh9f8PIQ== X-Google-Smtp-Source: AAOMgpesT7wcnOjLap79ErVV6WpfC+/1TZ4ZabHQR5f+gBAqQeeQFJw4ux1N395pVL0JiRSnLYqiog== X-Received: by 2002:adf:dbc3:: with SMTP id e3-v6mr10786666wrj.217.1532429476811; Tue, 24 Jul 2018 03:51:16 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r12-v6sm1767411wmc.27.2018.07.24.03.51.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jul 2018 03:51:11 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 5B8503E0641; Tue, 24 Jul 2018 11:51:10 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 24 Jul 2018 11:50:58 +0100 Message-Id: <20180724105109.8392-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180724105109.8392-1-alex.bennee@linaro.org> References: <20180724105109.8392-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::441 Subject: [Qemu-devel] [PULL 06/17] docker: move make check into check_qemu helper 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Not all docker images can run the check step. Let's move everything into a common helper so we don't need to replicate checks in the future. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/common.rc b/tests/docker/common.rc index ba1f942328..4ff5974016 100755 --- a/tests/docker/common.rc +++ b/tests/docker/common.rc @@ -40,6 +40,17 @@ build_qemu() make $MAKEFLAGS } +check_qemu() +{ + # default to make check unless the caller specifies + if test -z "$@"; then + INVOCATION="check" + else + INVOCATION="$@" + fi + make $MAKEFLAGS $INVOCATION +} + test_fail() { echo "$@" diff --git a/tests/docker/test-clang b/tests/docker/test-clang index e90a793178..324e341cea 100755 --- a/tests/docker/test-clang +++ b/tests/docker/test-clang @@ -23,5 +23,5 @@ OPTS="--cxx=clang++ --cc=clang --host-cc=clang" #OPTS="$OPTS --extra-cflags=-fsanitize=undefined \ #--extra-cflags=-fno-sanitize=float-divide-by-zero" build_qemu $OPTS -make $MAKEFLAGS check +check_qemu install_qemu diff --git a/tests/docker/test-debug b/tests/docker/test-debug index d3f9f70d01..137f4f2ddc 100755 --- a/tests/docker/test-debug +++ b/tests/docker/test-debug @@ -22,5 +22,5 @@ OPTS="--cxx=clang++ --cc=clang --host-cc=clang" OPTS="--enable-debug --enable-sanitizers $OPTS" build_qemu $OPTS -make $MAKEFLAGS V=1 check +check_qemu check V=1 install_qemu diff --git a/tests/docker/test-full b/tests/docker/test-full index b4e42d25d7..aadc0f00a2 100755 --- a/tests/docker/test-full +++ b/tests/docker/test-full @@ -15,4 +15,4 @@ cd "$BUILD_DIR" -build_qemu && make check $MAKEFLAGS && install_qemu +build_qemu && check_qemu && install_qemu diff --git a/tests/docker/test-quick b/tests/docker/test-quick index 3b7bce6105..eee59c55fb 100755 --- a/tests/docker/test-quick +++ b/tests/docker/test-quick @@ -18,5 +18,5 @@ cd "$BUILD_DIR" DEF_TARGET_LIST="x86_64-softmmu,aarch64-softmmu" TARGET_LIST=${TARGET_LIST:-$DEF_TARGET_LIST} \ build_qemu -make check $MAKEFLAGS +check_qemu install_qemu From patchwork Tue Jul 24 10:50:59 2018 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: 948386 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="ht4jokD3"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Zb3d0LX7z9s0R for ; Tue, 24 Jul 2018 20:59:57 +1000 (AEST) Received: from localhost ([::1]:39481 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhv2n-0007m2-Hc for incoming@patchwork.ozlabs.org; Tue, 24 Jul 2018 06:59:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60055) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhuuW-0000t1-Qr for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhuuW-0006UM-4H for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:20 -0400 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:36797) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fhuuV-0006TH-Ta for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:20 -0400 Received: by mail-wm0-x235.google.com with SMTP id s14-v6so2074359wmc.1 for ; Tue, 24 Jul 2018 03:51:19 -0700 (PDT) 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=aDn7+pNytd+9/TrsnS9pnTelzmPIf8iGN3kw0oQCgKo=; b=ht4jokD3yFXgJWgf2qAJetZILRquMN6wcaBSVxNcB4gB1YMTEQccxd7Bw9oilSyS0/ d3EoGmbQtRd1b4N9FywNwnfG8mPoda3KsTF2pbbQJf5sOciSolZ4+UoWvpmt3FlZW90K pc7SKqSIurMFv6kKE8LbFcnIE6oQ+r8w3U0m0= 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=aDn7+pNytd+9/TrsnS9pnTelzmPIf8iGN3kw0oQCgKo=; b=cWEm8W0ZatBY3jjiqiupI2wlm1C1RVukM88/rziiG8FBcLMxKVOtUtJa7ZUgRWFgjh /nGR2PIzrtFBJAwEjNxoW+CU2/lNF0l0lMHKoFLH6YlcRxJfVTXpNSq8tygn0i/Jlq3P psIm00ZKJ3QwCZumPowzF5dxgxIHzjVvgLi8oS+bEl+63GGXuhUA84roTjspdZ8XpZ9T P1ZsVt7rcnk3s7zPcR6FcKewrwxPOYLEk40Vue/sggw7qlZA/U5nk9qdn9OVQvhHK1NB f8dzjlq3egf8mzWUJhIH0Yw8gLwMI0tUuL1vb0GLzSvWofFxnKwpuJm80h8/rFCeCFVo gppw== X-Gm-Message-State: AOUpUlG7L1DywyG/q9jm6lL0+nD4L1sHhEcGOV8ivTSS5JoVhVyDLqHP ciUXfEHhbwrUH+eLG7hl5yoIW+TA2Gc= X-Google-Smtp-Source: AAOMgpewjCXjGqWu9x2sd0Ctnx3cIa8ge8ZElHy4wMeRV0UtwtQX6XKT7BYP0j2YGJUmY0gRlFYKZw== X-Received: by 2002:a1c:e5cd:: with SMTP id c196-v6mr1611411wmh.101.1532429478870; Tue, 24 Jul 2018 03:51:18 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x14-v6sm10417088wrv.21.2018.07.24.03.51.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jul 2018 03:51:16 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 6D9D63E067B; Tue, 24 Jul 2018 11:51:10 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 24 Jul 2018 11:50:59 +0100 Message-Id: <20180724105109.8392-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180724105109.8392-1-alex.bennee@linaro.org> References: <20180724105109.8392-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:400c:c09::235 Subject: [Qemu-devel] [PULL 07/17] docker: gracefully skip check_qemu 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Not all our images are able to run the tests. Rather than use features we can just check for the existence and run-ability of gtester. If the image has been setup for binfmt_misc it will be able to run anyway. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/common.rc b/tests/docker/common.rc index 4ff5974016..4011561587 100755 --- a/tests/docker/common.rc +++ b/tests/docker/common.rc @@ -48,7 +48,13 @@ check_qemu() else INVOCATION="$@" fi - make $MAKEFLAGS $INVOCATION + + if command -v gtester > /dev/null 2>&1 && \ + gtester --version > /dev/null 2>&1; then + make $MAKEFLAGS $INVOCATION + else + echo "No working gtester, skipping make $INVOCATION" + fi } test_fail() From patchwork Tue Jul 24 10:51:00 2018 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: 948375 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="FV7l1n78"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41ZZxl6fcBz9s29 for ; Tue, 24 Jul 2018 20:54:51 +1000 (AEST) Received: from localhost ([::1]:39454 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhuxt-0003BS-De for incoming@patchwork.ozlabs.org; Tue, 24 Jul 2018 06:54:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60083) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhuuY-0000up-7d for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhuuW-0006VX-Vw for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:22 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:37466) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fhuuW-0006UQ-Po for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:20 -0400 Received: by mail-wr1-x435.google.com with SMTP id q10-v6so3663647wrd.4 for ; Tue, 24 Jul 2018 03:51:20 -0700 (PDT) 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=SKBNE8s5kJLF934/FXOlELkPz95G61BlqHCY4RHu/2M=; b=FV7l1n78Gtdp9XqG9xIXZqBAXCZlNwRIwmoiKfFpeRIok7Ju7R5ggJ7v6b4GiKb5y2 50P91GhBcAOdjHW79knhcs199x7hbRttgBMHLTTS5Et/kGnhKsr7khiaMieOtAAbExER QLrKjvZ6+8KN/izwWKprDz+tLm5Dcpp6DU4Rw= 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=SKBNE8s5kJLF934/FXOlELkPz95G61BlqHCY4RHu/2M=; b=gzTIg4EM4PWSlVH2j76w9DPaJ4yuw9pP2ezWgXgT0l75YmxdjnFiznoXvLRaezv5GB 6rId3lvu3HoJFexQtVyuDwVJhzYqi9fUQDSQvtSVWv2xD/NJwMZHANiV/6QJzWZ/dxx8 qE40DDTFKsGdcepXKxtjHnuk0jmsqO+tJIkTsimTqr+Z/w+9F43A/gJj43U/bu28End3 KCKb5k/zntRfEjfjH1LkAG0ctW9DwcHD7Xn2XTcZzDXaDls9iG0cU6Ha2gBJLE5X5H6P JhWUc0qeFcJECVSEFN3/3ibjwMiFus5DkCOHBOpG1seQG3Tnx+C9Fi4UgFgSOBe0DVQ1 m+iQ== X-Gm-Message-State: AOUpUlFDKb8I9hhXo2qSFU4P3uBaME55e+12ZVZaO/Am42A4SLiC4JcF v3AiyQ2Cp1KYLhALcvTyAzaDrQ== X-Google-Smtp-Source: AAOMgpf3RfIJRTix76ne8vVZLotX+74SMeUvXReDolYp+XMiRjSurMzhtwi6tSyhHMNQCir+VhI1QA== X-Received: by 2002:adf:c109:: with SMTP id r9-v6mr11630462wre.233.1532429479632; Tue, 24 Jul 2018 03:51:19 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id m10-v6sm12613194wrj.35.2018.07.24.03.51.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jul 2018 03:51:16 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 810963E0684; Tue, 24 Jul 2018 11:51:10 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 24 Jul 2018 11:51:00 +0100 Message-Id: <20180724105109.8392-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180724105109.8392-1-alex.bennee@linaro.org> References: <20180724105109.8392-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::435 Subject: [Qemu-devel] [PULL 08/17] docker: Makefile.include don't include partial images 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Rename DOCKER_INTERMEDIATE_IMAGES to DOCKER_PARTIAL_IMAGES and add the incomplete cross compiler images that can build tests but can't build QEMU itself. We also add debian, debian-bootstrap and the tricode images to the list. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index b2a7e761cc..09fb7db7fa 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -6,7 +6,7 @@ DOCKER_SUFFIX := .docker DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles DOCKER_DEPRECATED_IMAGES := debian # we don't run tests on intermediate images (used as base by another image) -DOCKER_INTERMEDIATE_IMAGES := debian8 debian9 debian8-mxe debian-ports debian-sid +DOCKER_PARTIAL_IMAGES := debian debian8 debian9 debian8-mxe debian-ports debian-sid debian-bootstrap DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds @@ -121,6 +121,11 @@ docker-image-travis: NOUSER=1 # Specialist build images, sometimes very limited tools docker-image-tricore-cross: docker-image-debian9 +# These images may be good enough for building tests but not for test builds +DOCKER_PARTIAL_IMAGES += debian-alpha-cross debian-hppa-cross debian-m68k-cross debian-sh4-cross +DOCKER_PARTIAL_IMAGES += debian-sparc64-cross debian-mips64-cross debian-riscv64-cross +DOCKER_PARTIAL_IMAGES += debian-tricore-cross debian-powerpc-cross fedora-i386-cross + # Rules for building linux-user powered images # # These are slower than using native cross compiler setups but can @@ -137,7 +142,7 @@ docker-image-debian-powerpc-user-cross: docker-binfmt-image-debian-powerpc-user DOCKER_USER_IMAGES += debian-powerpc-user # Expand all the pre-requistes for each docker image and test combination -$(foreach i,$(filter-out $(DOCKER_INTERMEDIATE_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES)), \ +$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES)), \ $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \ $(eval .PHONY: docker-$t@$i) \ $(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \ From patchwork Tue Jul 24 10:51:01 2018 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: 948387 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="fIyXrMCI"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Zb3f5Grkz9s0R for ; Tue, 24 Jul 2018 20:59:58 +1000 (AEST) Received: from localhost ([::1]:39482 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhv2p-0007mT-7o for incoming@patchwork.ozlabs.org; Tue, 24 Jul 2018 06:59:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60180) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhuuf-00011m-0L for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhuub-0006YE-6z for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:29 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:44446) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fhuua-0006Y3-Vt for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:25 -0400 Received: by mail-wr1-x443.google.com with SMTP id r16-v6so3637677wrt.11 for ; Tue, 24 Jul 2018 03:51:24 -0700 (PDT) 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=uNU7ohYeREtFZBk+8VGwxnXxkQ8Q1isap1+53CabS00=; b=fIyXrMCIIdMkH+fsXiPInf0L+aKfcwAoI03k62Afe/rV7dFpI3blFWicb8WEPVlzJ4 ldVe+JqHNkkTsLi8PXcqIONigGczKZ99Kjdt2ahLn5FvPI4iY9UPkPOyzEkxgB/0oL7n HOf8gKon5E3S5r2qj1rdRwpbDCd8jF+MEzWdQ= 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=uNU7ohYeREtFZBk+8VGwxnXxkQ8Q1isap1+53CabS00=; b=BFsqIUcwbm8h+vNHAsOrgKg74A+dCZdWdJjG/iAV9qYLbJAzsA0mr4/Vy5NVwAFmKT 468yTrFoYrQyVfXtmc+hCisYbJOE8LTSAGfF/mbNHtNoPA4sq4PyCn0Hg/7u/PoWOEu6 WZzMtCbE5G/OgGriVyOkFa2oIg0KHXQsjlvefh4dpxsCYrWERuSvnjfMPveGzcoxeq/C yRYHzDeUfOlEPmNUkY+s8FeBcpk9d8hrkOevfQNm3+gK7ryo2DvzSy4NppFSo1Kk4E7J F5aAD9YbrxwvuG1lr0gvvWYKz6t21ViOHRQ5zQ4E6B4DmTRX/61DMUbCDVZTc1aN7171 vh5A== X-Gm-Message-State: AOUpUlGtG1G5HqXyJNIZJSxBtat3FinLujtcMZO82jYMujDRPeP4zg0B NrVbcvLWnVutsl0vJK/Gf7WVVA== X-Google-Smtp-Source: AAOMgpf6J3xAkTXyrCBAq66ZTyEf2yZHXy6K3b8XGBNcWrlk9jHEjco0i7FaL17OaOFSU5nqumGzgw== X-Received: by 2002:adf:ac66:: with SMTP id v93-v6mr11251302wrc.7.1532429483844; Tue, 24 Jul 2018 03:51:23 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v5-v6sm14772725wrp.87.2018.07.24.03.51.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jul 2018 03:51:17 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 92D503E0698; Tue, 24 Jul 2018 11:51:10 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 24 Jul 2018 11:51:01 +0100 Message-Id: <20180724105109.8392-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180724105109.8392-1-alex.bennee@linaro.org> References: <20180724105109.8392-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 09/17] docker: add test-unit runner 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This test doesn't even build QEMU, it just builds and runs all the unit tests. Intended to make checking unit tests on all docker images easier. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/test-unit b/tests/docker/test-unit new file mode 100755 index 0000000000..8905d01150 --- /dev/null +++ b/tests/docker/test-unit @@ -0,0 +1,21 @@ +#!/bin/bash -e +# +# Build and run the unit tests +# +# Copyright (c) 2018 Linaro Ltd. +# +# Authors: +# Alex Bennée +# +# This work is licensed under the terms of the GNU GPL, version 2 +# or (at your option) any later version. See the COPYING file in +# the top-level directory. + +. common.rc + +cd "$BUILD_DIR" + +# although we are not building QEMU itself we still need a configured +# build for the unit tests to be built and run +configure_qemu +check_qemu check-unit From patchwork Tue Jul 24 10:51:02 2018 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: 948391 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="LPpnpdUK"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Zb6w6kytz9s29 for ; Tue, 24 Jul 2018 21:02:48 +1000 (AEST) Received: from localhost ([::1]:39506 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhv5a-0002AF-JM for incoming@patchwork.ozlabs.org; Tue, 24 Jul 2018 07:02:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60175) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhuue-00011Z-RW for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhuua-0006Xz-6u for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:28 -0400 Received: from mail-wm0-x232.google.com ([2a00:1450:400c:c09::232]:53509) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fhuuZ-0006XZ-W5 for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:24 -0400 Received: by mail-wm0-x232.google.com with SMTP id s9-v6so2063181wmh.3 for ; Tue, 24 Jul 2018 03:51:23 -0700 (PDT) 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=errvMS9Ftu4xXKTrYquHE8yM488G2q+uPGhdhfHjxpw=; b=LPpnpdUKn60mRhUc1s7Y8W4vlpJVDZzUIkvRFrd/KWba3ICvSbc7qE2yedjc8iMcPS CMjCBjzFQeFJbKcp8ctYZc8uNdC+BfqazseewHpkUR3JtXIM65z4Yh2IxME2uNwXJd6F VZHMgPVlyN+dtDOANoRrrI2PlZ1E8etd2c8jE= 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=errvMS9Ftu4xXKTrYquHE8yM488G2q+uPGhdhfHjxpw=; b=WXnj9etf1+zczZziv9ZvZAEqDVmKzhwhRMTkiyxMiHohAkMDJlIMRcCYBeKNzr+THP IoqtNhBqafTFUMrXfCINd/ApTDZZ66XbQu1HOAEzQukQnVBxu/38BFj1omcmKbeGghtA 5AGLqpBFixPtVnxKAb9f9NdjN+V+0VAONpKmgwOuLjxkHagJc1VRW+fJt5MG+V9oNTwV 4du7yZSVW6X57c5eJQ9F5bKuFKYltyf3mgZ9YWeTfuJd6WIZVMtz5vX23b/xsFYutAB8 m9PoakqW76bKOM0TfzpnWojkuEGlPtW74TOz+ylDYrsZki2fo7gfqCfA9D9vtO5/qmq0 AABQ== X-Gm-Message-State: AOUpUlEzNMXKvIiD511EqSE+fE1huxnl5Ctb/Nw3Vb4pNjjTfo717Q5r KIZrOq9FpFT/88FgmBu854wRIfEy3B8= X-Google-Smtp-Source: AAOMgpeHDTMkuXiXgvuJSxt+fpneJAohkncTibLyPriIqULEF+5/35/u0TWwj0hUyPWWHZnTZxZZqg== X-Received: by 2002:a1c:3620:: with SMTP id d32-v6mr1756399wma.95.1532429482844; Tue, 24 Jul 2018 03:51:22 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id m207-v6sm1460665wma.31.2018.07.24.03.51.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jul 2018 03:51:17 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id A5D163E069F; Tue, 24 Jul 2018 11:51:10 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 24 Jul 2018 11:51:02 +0100 Message-Id: <20180724105109.8392-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180724105109.8392-1-alex.bennee@linaro.org> References: <20180724105109.8392-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:400c:c09::232 Subject: [Qemu-devel] [PULL 10/17] docker: add expansion for docker-test-FOO to Makefile.include 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This allows us to run a particular test on all docker images. For example: make docker-test-unit Will run the unit tests on every supported image. At the same time rename docker-test to docker-all-tests to be clearer. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 09fb7db7fa..8fbb076396 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -148,7 +148,8 @@ $(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPR $(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \ ) \ $(foreach t,$(DOCKER_TESTS), \ - $(eval docker-test: docker-$t@$i) \ + $(eval docker-all-tests: docker-$t@$i) \ + $(eval docker-$t: docker-$t@$i) \ ) \ ) @@ -158,7 +159,8 @@ docker: @echo 'Available targets:' @echo @echo ' docker: Print this help.' - @echo ' docker-test: Run all image/test combinations.' + @echo ' docker-all-tests: Run all image/test combinations.' + @echo ' docker-TEST: Run TEST on all image combinations.' @echo ' docker-clean: Kill and remove residual docker testing containers.' @echo ' docker-TEST@IMAGE: Run "TEST" in container "IMAGE".' @echo ' Note: "TEST" is one of the listed test name,' From patchwork Tue Jul 24 10:51:03 2018 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: 948378 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="XAoPvIvN"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41ZZxr0lkzz9s0R for ; Tue, 24 Jul 2018 20:54:56 +1000 (AEST) Received: from localhost ([::1]:39456 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhuxx-0003EY-Mu for incoming@patchwork.ozlabs.org; Tue, 24 Jul 2018 06:54:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60112) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhuuZ-0000vi-7Z for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhuuY-0006Wx-H1 for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:23 -0400 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:51433) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fhuuY-0006Wa-Am for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:22 -0400 Received: by mail-wm0-x235.google.com with SMTP id y2-v6so1446901wma.1 for ; Tue, 24 Jul 2018 03:51:21 -0700 (PDT) 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=oBOyisWYvelL8YHME7eneb5/LPBvVj5hhLp7keQSuw4=; b=XAoPvIvN0zEtS3mhuEV45PdyTySqdYd7fLXC0Xy4bUKCd9co8/gTSyHyk8eVA9k2vH VpVaT15d+YgErw+cpmJbKO/koujEWoZg90PhbE9EjO3dCVOQMhtUF0uvzzKzVTaEaWVm AuS0dvU8EpekUEknDWNSyFQ4QHKTk9YO7MMaE= 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=oBOyisWYvelL8YHME7eneb5/LPBvVj5hhLp7keQSuw4=; b=luUkUn+cB5thksO3GHNfpTfxbnDdMlrini6QaMx10uEy6rzmSj82lkERe7rbzyctaz fX8pfGywy/x3cvpJOSk0SrL6oMXjZX2msx5E9WbTKq5qenq7JyEzYGkNpvsI+iJaWKvR A/pLUV9XIwg/PA+IW/XcZUeaaj5HZcNFDs8zktB4XIYzjKbey+1ucuTK4AdeKWdfaUdF U0L1oYTn0oX4O231TRUpPI9CXgYWZ0Pl6FMBlC1znWnyEoRO/x6cLD/yde4s1Lw/7yNr U3jMTUCQUNsSuBLoSXhGZEqLxXnzb7GT1vY4ky4TADI+IZHJzeDieyxaACjWID9McEY1 5k/g== X-Gm-Message-State: AOUpUlHjt9dc3UCZjVa0LuKpaZ+NdxB/r+MN3givcx6fF7FYmKzqhG7Y uVlUb7NChX1xvlYn455mWe9kzc0Vtp4= X-Google-Smtp-Source: AAOMgpf+3I+BKJ+4/jjg6btwa+c9TqdOX+asIUGlaH09yNND4ac+pXFQTUI6+/aqXAAEAYs8qxgSSA== X-Received: by 2002:a1c:19c2:: with SMTP id 185-v6mr1675367wmz.79.1532429481052; Tue, 24 Jul 2018 03:51:21 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 127-v6sm1327457wmd.18.2018.07.24.03.51.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jul 2018 03:51:17 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id B85963E06A6; Tue, 24 Jul 2018 11:51:10 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 24 Jul 2018 11:51:03 +0100 Message-Id: <20180724105109.8392-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180724105109.8392-1-alex.bennee@linaro.org> References: <20180724105109.8392-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:400c:c09::235 Subject: [Qemu-devel] [PULL 11/17] docker: drop QEMU_TARGET check, fallback in EXECUTABLE not set 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The addition of QEMU_TARGET was intended to ensure we fall back to checking for the existence of an image if the build system was not currently configured to build it. However this breaks the direct use of the rule for building custom binfmt_misc images. We already check for EXECUTABLE so let us just use that as a proxy for deciding if we are just going to check the image exits. Signed-off-by: Alex Bennée Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 8fbb076396..05afeb64a7 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -58,13 +58,11 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker $(if $(EXECUTABLE),,\ $(error EXECUTABLE not set, debootstrap of debian-$* would fail)) - $(if $(wildcard $(EXECUTABLE)),,\ - $(error Please build $(EXECUTABLE) first)) $(if $(DEB_ARCH),,\ $(error DEB_ARCH not set, debootstrap of debian-$* would fail)) $(if $(DEB_TYPE),,\ $(error DEB_TYPE not set, debootstrap of debian-$* would fail)) - $(if $(filter $(QEMU_TARGET),$(TARGET_DIRS)), \ + $(if $(wildcard $(EXECUTABLE)), \ $(call quiet-command, \ DEB_ARCH=$(DEB_ARCH) \ DEB_TYPE=$(DEB_TYPE) \ @@ -136,7 +134,6 @@ DOCKER_PARTIAL_IMAGES += debian-tricore-cross debian-powerpc-cross fedora-i386-c # broken so we need a qemu-linux-user for this target docker-binfmt-image-debian-powerpc-user: DEB_ARCH = powerpc docker-binfmt-image-debian-powerpc-user: DEB_TYPE = jessie -docker-binfmt-image-debian-powerpc-user: QEMU_TARGET = ppc-linux-user docker-binfmt-image-debian-powerpc-user: EXECUTABLE = ${BUILD_DIR}/ppc-linux-user/qemu-ppc docker-image-debian-powerpc-user-cross: docker-binfmt-image-debian-powerpc-user DOCKER_USER_IMAGES += debian-powerpc-user From patchwork Tue Jul 24 10:51:04 2018 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: 948379 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="C0/t3BMX"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Zb0t5xv1z9s2M for ; Tue, 24 Jul 2018 20:57:34 +1000 (AEST) Received: from localhost ([::1]:39471 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhv0W-0005xr-EO for incoming@patchwork.ozlabs.org; Tue, 24 Jul 2018 06:57:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhuua-0000wd-0W for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhuuZ-0006XR-7t for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:24 -0400 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]:40559) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fhuuZ-0006Wq-1Q for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:23 -0400 Received: by mail-wm0-x236.google.com with SMTP id y9-v6so1229788wma.5 for ; Tue, 24 Jul 2018 03:51:22 -0700 (PDT) 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=KhFmSjfE9J0zu8fVzdh85dmgmRF8QtVjlHDWe9pssY4=; b=C0/t3BMX7hr36nVRKCwAoITJ7Cw2XSoavHmiHbaiR4hrU2A2nrlQkkF8/Iyu4W3nSd ad7jNcOfyKvtF8KkPMiOMrVvuYeS+sQqbQ40xPGhftIi9BRAcviLbl3yJMmXzvvOcvJU OOihb6M5brsIoI4jeY/kgi4csj/pCF0L489/Y= 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=KhFmSjfE9J0zu8fVzdh85dmgmRF8QtVjlHDWe9pssY4=; b=PzPwGRtGvNcxkKFItZn8JkV09AFvyMz/1hoMcy8QBt//eoI4jz8wYP1xK0Fouxvz7p HztCHdugrq4Fkn1d08bWJNhEoRCy55YoVAoUKHYt7xDXHz+SvwzDV8xaawBG5VG8rane r0Cj2w59jz/nmdqKtezn7YoiK1pmddLSIli2B253XU+rnEcSmlNsxX6E03AlRONAGu6v j3+dJcQcxfiqndbbL1ruM5n6/xULyVRFw4W7e2vuOHDaTp16VUeSaMmpy9f5uLMqDkov TNa1GE4azTUmj6318md3ZhvyF8YxGbo0Jd8PjLZ0quIqX2kB/HFnLV746bCXCLEiHVXc C3YA== X-Gm-Message-State: AOUpUlGuGo58NWzTOui8WJX6xVkE8zcst9gklbf7sgN5wYHCH3i/B7km x2MLYAKiVEpdOqarGlLwa7mDng== X-Google-Smtp-Source: AAOMgpeuTCcOTmXsvMfAr63lXmQgYnm/tVl1dSPgbaFegALw5LaVMj4wfK/DVvBcqZ9Ljsrp1LsELA== X-Received: by 2002:a1c:af53:: with SMTP id y80-v6mr1526034wme.55.1532429481841; Tue, 24 Jul 2018 03:51:21 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id i205-v6sm2469165wmf.30.2018.07.24.03.51.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jul 2018 03:51:17 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id CA77B3E06D2; Tue, 24 Jul 2018 11:51:10 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 24 Jul 2018 11:51:04 +0100 Message-Id: <20180724105109.8392-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180724105109.8392-1-alex.bennee@linaro.org> References: <20180724105109.8392-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:400c:c09::236 Subject: [Qemu-devel] [PULL 12/17] docker: report hint when docker.py check fails 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" When a check fails we currently just report why we failed. This is not totally helpful to people who want to boot-strap a new image. Report a hint as to why it failed. Signed-off-by: Alex Bennée Suggested-by: Fam Zheng diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 05afeb64a7..1aaa795743 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -73,7 +73,8 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)), \ "BUILD","binfmt debian-$* (debootstrapped)"), \ $(call quiet-command, \ - $(DOCKER_SCRIPT) check --quiet qemu:debian-$* $<, \ + $(DOCKER_SCRIPT) check --quiet qemu:debian-$* $< || \ + { echo "You will need to build $(EXECUTABLE)"; exit 1;},\ "CHECK", "debian-$* exists")) endif From patchwork Tue Jul 24 10:51:05 2018 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: 948381 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="eMstU3AH"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Zb3B4kb3z9s0R for ; Tue, 24 Jul 2018 20:59:34 +1000 (AEST) Received: from localhost ([::1]:39477 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhv2S-0007RH-AA for incoming@patchwork.ozlabs.org; Tue, 24 Jul 2018 06:59:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34050) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhv1m-0007PT-AG for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:58:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhv1l-0000km-Cy for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:58:50 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:40504) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fhv1l-0000kS-4o for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:58:49 -0400 Received: by mail-wr1-x443.google.com with SMTP id t6-v6so3676080wrn.7 for ; Tue, 24 Jul 2018 03:58:48 -0700 (PDT) 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=3FyTpCTbq+dj9K5amq3eowL6XEN+9dd/sfbr8RfRe3Q=; b=eMstU3AHhklpdiOlk63y8fJBCMZ3vXgJ8ZubqZXZombc5aW/qvWd7J+/cRxg/m5d0F VllXVWQUG5au5aVaLQngwbltK1TYTJ3r3YtNzucEs42f1/aCMKhzzqj7ehYIIfM4dIgc W4uoDPM5v8v8T7dlpkmsGtVWCkJ18JQ+/9r20= 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=3FyTpCTbq+dj9K5amq3eowL6XEN+9dd/sfbr8RfRe3Q=; b=adVdvK1uOvbi1PyjnxAYheOW5ofZQZvZY8xPHNzSmsEYYe40HsnZ0171EmRSVRlRMd V5vg5dwuZHntDp81EFCBN3z4t6O3aKoTxPEfzodseiZObwcSHnLgmCv27NA4n1dYMjPr I3htg6kMcpEXIlpqzgSa6N0dgc8mSDxAtbnS0reMGuIW+EQChPXMEr0ATxJ5tgqZF+x/ 4Eo2NYdlt9i29mNNxMk12DdWdsZrbZS3KinTlLdk4iKDbBekjzewnPu+NJc8JNkhpKr0 3rWbVo8xM7Qs97nim4M/pi8rujtX7m2VKxD+Et2QL3hd1GsycbIwmRcoAsTolxwGBnwm 1CzQ== X-Gm-Message-State: AOUpUlFqMvNpRgk0bvfDu10QIdr7hHQMqC9D5XXEg1TH8C1fuysTmtkW dNgqaSFFa8S04sQJG3zqYzKFkA== X-Google-Smtp-Source: AAOMgpcDq4dKQ7WfVSFHR920noZS6NW9ZMfmBBZGWVinpx7JodQj0LyC/oPu4L5kg+ojg3E5pwCDGg== X-Received: by 2002:adf:9e84:: with SMTP id a4-v6mr11158097wrf.70.1532429928042; Tue, 24 Jul 2018 03:58:48 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id q11-v6sm17162014wrp.58.2018.07.24.03.58.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jul 2018 03:58:46 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id DDEB83E06EA; Tue, 24 Jul 2018 11:51:10 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 24 Jul 2018 11:51:05 +0100 Message-Id: <20180724105109.8392-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180724105109.8392-1-alex.bennee@linaro.org> References: <20180724105109.8392-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 13/17] docker: Update debootstrap script after Debian migration from Alioth to Salsa 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé This silents the following warning: Cloning into './debootstrap.git'... warning: redirecting to https://salsa.debian.org/installer-team/debootstrap.git/ See https://lists.debian.org/debian-devel-announce/2018/01/msg00004.html Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée diff --git a/tests/docker/dockerfiles/debian-bootstrap.pre b/tests/docker/dockerfiles/debian-bootstrap.pre index 56e1aa7a21..ea324d6e4a 100755 --- a/tests/docker/dockerfiles/debian-bootstrap.pre +++ b/tests/docker/dockerfiles/debian-bootstrap.pre @@ -62,7 +62,7 @@ if [ -z $DEBOOTSTRAP_DIR ]; then NEED_DEBOOTSTRAP=true fi if $NEED_DEBOOTSTRAP; then - DEBOOTSTRAP_SOURCE=https://anonscm.debian.org/git/d-i/debootstrap.git + DEBOOTSTRAP_SOURCE=https://salsa.debian.org/installer-team/debootstrap.git git clone ${DEBOOTSTRAP_SOURCE} ./debootstrap.git export DEBOOTSTRAP_DIR=./debootstrap.git DEBOOTSTRAP=./debootstrap.git/debootstrap From patchwork Tue Jul 24 10:51:06 2018 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: 948393 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="V/aPEmnL"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41ZbBb1r3yz9s0R for ; Tue, 24 Jul 2018 21:05:59 +1000 (AEST) Received: from localhost ([::1]:39534 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhv8e-0004y5-13 for incoming@patchwork.ozlabs.org; Tue, 24 Jul 2018 07:05:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhv1n-0007Q8-3b for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:58:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhv1m-0000l6-DD for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:58:51 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:40503) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fhv1m-0000kv-59 for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:58:50 -0400 Received: by mail-wr1-x441.google.com with SMTP id t6-v6so3676144wrn.7 for ; Tue, 24 Jul 2018 03:58:49 -0700 (PDT) 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=Uej+E9n73u2wYcO2IX7ys7A1yTwqBiT1Vdp7q1oH8Wo=; b=V/aPEmnLwwhueywlvYH/KWxtH/NgwlUFTsJSpYO2inT6I2wN02Oh5lTv6uS3Nfgiqd bMwqHn00NZk+DHL82zcqSWm8dxbc223DdaYQ3a6TO2PVA5zOXzQnuO2zI0rRu79xFVbM N1nj/SiDFBJwiQEmzS4mn2ckBBQkyQMNZ5p6E= 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=Uej+E9n73u2wYcO2IX7ys7A1yTwqBiT1Vdp7q1oH8Wo=; b=NmOXbriyExWWbcZLggLq8OwHRts5ynBRXTNf6x5MwiqoPhk26SAOAuIAfOAYJPsHR0 6ARTP1yG0rQQHZ6DI9vQcVfvgUfwO/71XBJvwu8m5YD0BH3xyxCwCdxBN5mlERsCA5Qc ZztrWfMARzXr1uS/u72vgkza84Glb0/eLYQhx4BEFnTBH5t3E+L33cVtQoEHsukAi2jp J5qL/iHb5BaXQk27TJg2Bn+eJhNHiDtqqtNY9EdF/xsmvebLcAVw7pqnt0qOTYami8b2 WOtfZrgFATm/AsUFgknnb2nsJsQjEorjYB05kcf90WuGbCcYDpJd1VkPrIcNkG1Byqgm GAfg== X-Gm-Message-State: AOUpUlFTEPdLKEoG5hgS8vZNcZwQSGZyLzbc4n3fUGtOMvEufeJx/CAv i/8PBJfr6UWKaKMXeTRkwaYj7w== X-Google-Smtp-Source: AAOMgpdxsFG71HC7H0KWexTvg6mdUPaof6r6IQu1/1QpF5typjsWGqw62dyU6nGiuNC2siwSWkmYPg== X-Received: by 2002:a5d:550a:: with SMTP id b10-v6mr11710166wrv.228.1532429928999; Tue, 24 Jul 2018 03:58:48 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id w4-v6sm9962207wrt.40.2018.07.24.03.58.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jul 2018 03:58:46 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id F07E13E0701; Tue, 24 Jul 2018 11:51:10 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 24 Jul 2018 11:51:06 +0100 Message-Id: <20180724105109.8392-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180724105109.8392-1-alex.bennee@linaro.org> References: <20180724105109.8392-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::441 Subject: [Qemu-devel] [PULL 14/17] docker: add commentary to debian-bootstrap.docker 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This is just a note that later versions of debootstrap don't technically need this hack. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/docker/dockerfiles/debian-bootstrap.docker b/tests/docker/dockerfiles/debian-bootstrap.docker index 14212b9cf4..e13c26a7ed 100644 --- a/tests/docker/dockerfiles/debian-bootstrap.docker +++ b/tests/docker/dockerfiles/debian-bootstrap.docker @@ -9,6 +9,7 @@ FROM scratch ADD . / # Patch all mounts as docker already has stuff set up +# (this is not needed for later debootstraps but is harmless atm) RUN sed -i 's/in_target mount/echo not for docker in_target mount/g' /debootstrap/functions # Run stage 2 From patchwork Tue Jul 24 10:51:07 2018 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: 948392 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="QH+DwaIt"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Zb6z5HlHz9s29 for ; Tue, 24 Jul 2018 21:02:51 +1000 (AEST) Received: from localhost ([::1]:39509 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhv5d-0002Dj-Bo for incoming@patchwork.ozlabs.org; Tue, 24 Jul 2018 07:02:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60179) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhuuf-00011k-0C for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhuuc-0006YU-4a for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:29 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:42696) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fhuub-0006YK-Tk for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:26 -0400 Received: by mail-wr1-x441.google.com with SMTP id e7-v6so3655459wrs.9 for ; Tue, 24 Jul 2018 03:51:25 -0700 (PDT) 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=k+ndgvtDn3eLRElCpCPjGJckcWE4KOtFS46rdAqN8gE=; b=QH+DwaItTfDJrMiOMSEVNx+OZW54xxkPPVvHmsbCj/K4lTzLlHQcyGitFY+Eo57O7d 07NV5uufNKkdmgozJMFuydx7kKt+Ch8rMdiEe4pWMr9tLF4PduLjoV6p4iC+6+Akd7ai /BStzLquVmfDGqHOVpT2M6eomKHpoUvu4nHYs= 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=k+ndgvtDn3eLRElCpCPjGJckcWE4KOtFS46rdAqN8gE=; b=Pa58jAl2BMXnyNGtUgCkLuFQg1GzUAw1mtiPYwDdZo3K4XJxaTwD+saJZsZwdli5XO iRhI4r5mmVb87f9oAcoU0A+jcjB43q9nkiTPJWdlncKbXB3rcLzN73INZGp81ZnHPw41 lKN+3yEDF5exixxCmqw1qChLyYViarVk1d0QLOtuCiF68i9OOrr1b7XkyiRjGVeGLNtV tDbEe7D12bb4vW8VjrZ5Fbx0bhX+kGVCIQvajKJMqWG+0jCOv+PVnDWOZgjaXhKWINO3 BE4sefnZaSP17l/dCS4Cxps35Ct+8cevjieg98OHURMKoGeADhTAjzw4RcU0dQdVdccg DkDA== X-Gm-Message-State: AOUpUlEYufZjvDpMt9Ay3Oz09LW0J6Z/zr1fnN31ZxTqLFukNjVGnVM9 Y8Eh3IRsEcVUeWrw1iQshYJOPg== X-Google-Smtp-Source: AAOMgpdxx+OxHlbGAAF/h0abM0sycubcqqspN9IThsojEdyOgsTxiu6qStwhzh3NVDi217fGBAIzXA== X-Received: by 2002:adf:cd0e:: with SMTP id w14-v6mr10511547wrm.226.1532429484843; Tue, 24 Jul 2018 03:51:24 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 5-v6sm1921804wmv.48.2018.07.24.03.51.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jul 2018 03:51:19 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 0F23A3E050B; Tue, 24 Jul 2018 11:51:11 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 24 Jul 2018 11:51:07 +0100 Message-Id: <20180724105109.8392-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180724105109.8392-1-alex.bennee@linaro.org> References: <20180724105109.8392-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::441 Subject: [Qemu-devel] [PULL 15/17] docker: ignore distro versioning of debootstrap 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We do a minimum version check for the debootstrap but if the distro has added their own minor version tick it would fail and fall-back to the SCM version. This is sub-optimal as the latest/greatest version may be broken at any one particular time. We fix that with a little sed magic on the version string before passing to our ugly shell versioning check. Signed-off-by: Alex Bennée Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/dockerfiles/debian-bootstrap.pre b/tests/docker/dockerfiles/debian-bootstrap.pre index ea324d6e4a..3b0ef95374 100755 --- a/tests/docker/dockerfiles/debian-bootstrap.pre +++ b/tests/docker/dockerfiles/debian-bootstrap.pre @@ -56,10 +56,13 @@ if [ -z $DEBOOTSTRAP_DIR ]; then if [ -z $DEBOOTSTRAP ]; then echo "No debootstrap installed, attempting to install from SCM" NEED_DEBOOTSTRAP=true - elif ! (echo "${MIN_DEBOOTSTRAP_VERSION}" ; "${DEBOOTSTRAP}" --version \ - | cut -d ' ' -f 2) | sort -t . -n -k 1,1 -k 2,2 -k 3,3 -c &>/dev/null; then - echo "debootstrap too old, attempting to install from SCM" - NEED_DEBOOTSTRAP=true + else + INSTALLED_VERSION=$(${DEBOOTSTRAP} --version | sed 's/debootstrap \([0-9\.]*\)[^0-9\.]*.*/\1/') + if ! (echo "${MIN_DEBOOTSTRAP_VERSION}" ; echo "${INSTALLED_VERSION}") \ + | sort -t . -n -k 1,1 -k 2,2 -k 3,3 -C ; then + echo "debootstrap too old, attempting to install from SCM" + NEED_DEBOOTSTRAP=true + fi fi if $NEED_DEBOOTSTRAP; then DEBOOTSTRAP_SOURCE=https://salsa.debian.org/installer-team/debootstrap.git From patchwork Tue Jul 24 10:51:08 2018 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: 948394 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="FhhdhGR1"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41ZbFp54Z7z9s0R for ; Tue, 24 Jul 2018 21:08:45 +1000 (AEST) Received: from localhost ([::1]:39552 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhvBI-0006g4-Ap for incoming@patchwork.ozlabs.org; Tue, 24 Jul 2018 07:08:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34079) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhv1o-0007R3-Ad for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:58:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhv1n-0000li-E6 for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:58:52 -0400 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]:54857) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fhv1n-0000lJ-7L for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:58:51 -0400 Received: by mail-wm0-x22c.google.com with SMTP id c14-v6so2072213wmb.4 for ; Tue, 24 Jul 2018 03:58:51 -0700 (PDT) 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=PnFN5FS2xP69E9wMMeQYrIzwdK/U7cqY4mU/KHwg9jw=; b=FhhdhGR1o+6RImJA81GJHr4ARn11nBbpM7iTWcdl8iUsz7ZIRy9nUxUnRohUajWm7S 8Krmq9ciuWUB8RtY8cCGYJoZwrvUgbN/kpu/7upGRk4m+2ii4QGVDmzoPE71zBiWkTzv 69F+t0T+Y3XCnggUTOi3aecniOqnuuWeXlFo8= 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=PnFN5FS2xP69E9wMMeQYrIzwdK/U7cqY4mU/KHwg9jw=; b=ZDyi+qKA9O6MfJr7Ue/3xQ7ZkhAk9yrrSWve9rLRe/N06heqCPcTuHHXQ5Ykorn7mk ZcLT7uXccakBJLN+FywSwVN/cvjpqmITN2nuZBvbuEy50ApTc0rOAyMhNTOxEJmgDbvM WFq3DWzFWl1N1DLKDKW+5A/aPAlIpXJ/sdI/Xwqp1EiESIkho2caW8hxeB8cqzJdguTm 3oc+ZFhN7U3URImaHyrPKkEMVNQWDLVF6TaJG3Zl/FrBhv7kE7LoA8PBxDTxugmRvlmG JhrPI0mGb5T7GXP5EYAq9P4W5OiWDcgw3Y+zZsRiK4sgohyeeaggmPHK4zB+22dk3Y6F Qutw== X-Gm-Message-State: AOUpUlG7wZLEWE12m12l6MoiFRWDZdE3gUPTFU0uxhmwyEO4KPVk+6Dv w2qOOz/j7+e6HW3jxaNn1y5ldA== X-Google-Smtp-Source: AAOMgpcDWuB5CEBWid5AGL+TKGdbOuizGbq11LPw9FMRxDOxILqGK3/PmGjayGWnEtqMavOf1tIZQw== X-Received: by 2002:a1c:8a04:: with SMTP id m4-v6mr1592336wmd.137.1532429930068; Tue, 24 Jul 2018 03:58:50 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id h5-v6sm8718020wre.46.2018.07.24.03.58.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jul 2018 03:58:46 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 21EBF3E0719; Tue, 24 Jul 2018 11:51:11 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 24 Jul 2018 11:51:08 +0100 Message-Id: <20180724105109.8392-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180724105109.8392-1-alex.bennee@linaro.org> References: <20180724105109.8392-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:400c:c09::22c Subject: [Qemu-devel] [PULL 16/17] docker: perform basic binfmt_misc validation in docker.py 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Setting up binfmt_misc is outside of the scope of the docker.py script but we can at least validate it with any given executable so we have a more useful error message than the sed line of deboostrap failing cryptically. Signed-off-by: Alex Bennée Reported-by: Richard Henderson diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 2f81c6b13b..d3006d4dae 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -112,6 +112,31 @@ def _copy_binary_with_libs(src, dest_dir): so_path = os.path.dirname(l) _copy_with_mkdir(l , dest_dir, so_path) + +def _check_binfmt_misc(executable): + """Check binfmt_misc has entry for executable in the right place. + + The details of setting up binfmt_misc are outside the scope of + this script but we should at least fail early with a useful + message if it won't work.""" + + binary = os.path.basename(executable) + binfmt_entry = "/proc/sys/fs/binfmt_misc/%s" % (binary) + + if not os.path.exists(binfmt_entry): + print ("No binfmt_misc entry for %s" % (binary)) + return False + + with open(binfmt_entry) as x: entry = x.read() + + qpath = "/usr/bin/%s" % (binary) + if not re.search("interpreter %s\n" % (qpath), entry): + print ("binfmt_misc for %s does not point to %s" % (binary, qpath)) + return False + + return True + + def _read_qemu_dockerfile(img_name): # special case for Debian linux-user images if img_name.startswith("debian") and img_name.endswith("user"): @@ -315,6 +340,11 @@ class BuildCommand(SubCommand): # Create a docker context directory for the build docker_dir = tempfile.mkdtemp(prefix="docker_build") + # Validate binfmt_misc will work + if args.include_executable: + if not _check_binfmt_misc(args.include_executable): + return 1 + # Is there a .pre file to run in the build context? docker_pre = os.path.splitext(args.dockerfile)[0]+".pre" if os.path.exists(docker_pre): From patchwork Tue Jul 24 10:51:09 2018 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: 948388 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="VzyXmC9o"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Zb3p5F0Nz9s0R for ; Tue, 24 Jul 2018 21:00:06 +1000 (AEST) Received: from localhost ([::1]:39485 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhv2x-0007tU-CK for incoming@patchwork.ozlabs.org; Tue, 24 Jul 2018 07:00:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34051) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhv1m-0007PV-AI for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:58:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhv1k-0000kW-QE for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:58:50 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:40107) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fhv1k-0000kK-GV for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:58:48 -0400 Received: by mail-wm0-x244.google.com with SMTP id y9-v6so1252638wma.5 for ; Tue, 24 Jul 2018 03:58:48 -0700 (PDT) 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=hxKEMlC/fwAWde72FJ/A17vNzuwLpn2MYRkDcIREctA=; b=VzyXmC9o9oeBoacUgf0RnSAK2Z7EaYtdU2VWyB/J4azAHBY76f5LClx9ha8xD3rNfQ drXplB61SD1rwCHeyd6C/0/usL86SCVPZQsOOtDlgMXYIUFYezlaxNRWrc/js83sDlMB 98jiMqU3vN6vDcgNAU+dsKtpGLaMHdwits1Qw= 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=hxKEMlC/fwAWde72FJ/A17vNzuwLpn2MYRkDcIREctA=; b=e64clh+u4SAGAtdN/SBdiQi/A7EWmZ1GC96OqAjLNvU992D6NZgamq7MG5GCHAx7Eu Tlci8wV+XmruHzRIyG2nDYtyMqCCKiRpDDmYz8sQABTLtJf64hXaQA7wVTsPX3tc3ADb J5+0libfG3sLtXuTAvMmaIgMi7B/JS07zj9C/RjxAiZuixsI0eag2laO2hcoa/YdFK/8 qjARGqL+H9+3O6Sff0mWZkPzTtnVEkN9JTiUJMJpYey+NdefNroQPOEPSuZy96pjE40m +JZVYXNTcWsKkrxIPxmaKN8pRsyF6n9uebVcgDwhkS1KpeosIsSEqhZWE+btKnuZNA2u 8CWA== X-Gm-Message-State: AOUpUlEvQdgR9Jrr+AQcYnJ4KCc6dYx79loku4DnUHaLx5ekaKPb4N8p K97b4ayFhNZGWbh7av+rCAvT+g== X-Google-Smtp-Source: AAOMgpfXV5+ojwM6E5rtWeDrHMCl7KLvsmRxtzO7z6DHcnIptiuwd/eUcTy7Tg8D0/+NuuF8646TSA== X-Received: by 2002:a1c:4d09:: with SMTP id o9-v6mr1787619wmh.111.1532429927287; Tue, 24 Jul 2018 03:58:47 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id q188-v6sm2321523wmd.36.2018.07.24.03.58.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jul 2018 03:58:46 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 37ABA3E072C; Tue, 24 Jul 2018 11:51:11 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 24 Jul 2018 11:51:09 +0100 Message-Id: <20180724105109.8392-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180724105109.8392-1-alex.bennee@linaro.org> References: <20180724105109.8392-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:400c:c09::244 Subject: [Qemu-devel] [PULL 17/17] tests/tcg: remove runcom test 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: Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Eduardo Habkost , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The combination of being rather esoteric and needing to support mmap @ 0 means this only ever worked under translation. It has now regressed even further and is no longer useful. Kill it. Signed-off-by: Alex Bennée Reviewed-by: Peter Maydell diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target index c1997a1624..b4033ba3d1 100644 --- a/tests/tcg/i386/Makefile.target +++ b/tests/tcg/i386/Makefile.target @@ -29,11 +29,6 @@ test-i386: test-i386.c test-i386-code16.S test-i386-vm86.S test-i386.h test-i386 $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \ $( -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -extern int vm86 (unsigned long int subfunction, - struct vm86plus_struct *info); - -#define VIF_MASK 0x00080000 - -//#define SIGTEST - -#define COM_BASE_ADDR 0x10100 - -static void usage(void) -{ - printf("runcom version 0.1 (c) 2003 Fabrice Bellard\n" - "usage: runcom file.com\n" - "VM86 Run simple .com DOS executables (linux vm86 test mode)\n"); - exit(1); -} - -static inline void set_bit(uint8_t *a, unsigned int bit) -{ - a[bit / 8] |= (1 << (bit % 8)); -} - -static inline uint8_t *seg_to_linear(unsigned int seg, unsigned int reg) -{ - return (uint8_t *)((seg << 4) + (reg & 0xffff)); -} - -static inline void pushw(struct vm86_regs *r, int val) -{ - r->esp = (r->esp & ~0xffff) | ((r->esp - 2) & 0xffff); - *(uint16_t *)seg_to_linear(r->ss, r->esp) = val; -} - -void dump_regs(struct vm86_regs *r) -{ - fprintf(stderr, - "EAX=%08lx EBX=%08lx ECX=%08lx EDX=%08lx\n" - "ESI=%08lx EDI=%08lx EBP=%08lx ESP=%08lx\n" - "EIP=%08lx EFL=%08lx\n" - "CS=%04x DS=%04x ES=%04x SS=%04x FS=%04x GS=%04x\n", - r->eax, r->ebx, r->ecx, r->edx, r->esi, r->edi, r->ebp, r->esp, - r->eip, r->eflags, - r->cs, r->ds, r->es, r->ss, r->fs, r->gs); -} - -#ifdef SIGTEST -void alarm_handler(int sig) -{ - fprintf(stderr, "alarm signal=%d\n", sig); - alarm(1); -} -#endif - -int main(int argc, char **argv) -{ - uint8_t *vm86_mem; - const char *filename; - int fd, ret, seg; - struct vm86plus_struct ctx; - struct vm86_regs *r; - - if (argc != 2) - usage(); - filename = argv[1]; - - vm86_mem = mmap((void *)0x00000000, 0x110000, - PROT_WRITE | PROT_READ | PROT_EXEC, - MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0); - if (vm86_mem == MAP_FAILED) { - perror("mmap"); - exit(1); - } -#ifdef SIGTEST - { - struct sigaction act; - - act.sa_handler = alarm_handler; - sigemptyset(&act.sa_mask); - act.sa_flags = 0; - sigaction(SIGALRM, &act, NULL); - alarm(1); - } -#endif - - /* load the MSDOS .com executable */ - fd = open(filename, O_RDONLY); - if (fd < 0) { - perror(filename); - exit(1); - } - ret = read(fd, vm86_mem + COM_BASE_ADDR, 65536 - 256); - if (ret < 0) { - perror("read"); - exit(1); - } - close(fd); - - memset(&ctx, 0, sizeof(ctx)); - /* init basic registers */ - r = &ctx.regs; - r->eip = 0x100; - r->esp = 0xfffe; - seg = (COM_BASE_ADDR - 0x100) >> 4; - r->cs = seg; - r->ss = seg; - r->ds = seg; - r->es = seg; - r->fs = seg; - r->gs = seg; - r->eflags = VIF_MASK; - - /* put return code */ - set_bit((uint8_t *)&ctx.int_revectored, 0x21); - *seg_to_linear(r->cs, 0) = 0xb4; /* mov ah, $0 */ - *seg_to_linear(r->cs, 1) = 0x00; - *seg_to_linear(r->cs, 2) = 0xcd; /* int $0x21 */ - *seg_to_linear(r->cs, 3) = 0x21; - pushw(&ctx.regs, 0x0000); - - /* the value of these registers seem to be assumed by pi_10.com */ - r->esi = 0x100; - r->ecx = 0xff; - r->ebp = 0x0900; - r->edi = 0xfffe; - - for(;;) { - ret = vm86(VM86_ENTER, &ctx); - switch(VM86_TYPE(ret)) { - case VM86_INTx: - { - int int_num, ah; - - int_num = VM86_ARG(ret); - if (int_num != 0x21) - goto unknown_int; - ah = (r->eax >> 8) & 0xff; - switch(ah) { - case 0x00: /* exit */ - exit(0); - case 0x02: /* write char */ - { - uint8_t c = r->edx; - write(1, &c, 1); - } - break; - case 0x09: /* write string */ - { - uint8_t c; - for(;;) { - c = *seg_to_linear(r->ds, r->edx); - if (c == '$') - break; - write(1, &c, 1); - } - r->eax = (r->eax & ~0xff) | '$'; - } - break; - default: - unknown_int: - fprintf(stderr, "unsupported int 0x%02x\n", int_num); - dump_regs(&ctx.regs); - // exit(1); - } - } - break; - case VM86_SIGNAL: - /* a signal came, we just ignore that */ - break; - case VM86_STI: - break; - default: - fprintf(stderr, "unhandled vm86 return code (0x%x)\n", ret); - dump_regs(&ctx.regs); - exit(1); - } - } -}