From patchwork Fri Jul 13 12:17:26 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: 943483 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="COiD+wWw"; 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 41RsLF4gR6z9s0n for ; Fri, 13 Jul 2018 22:19:17 +1000 (AEST) Received: from localhost ([::1]:36964 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdx2Z-0005P7-9Y for incoming@patchwork.ozlabs.org; Fri, 13 Jul 2018 08:19:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57207) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdx19-0004lR-JZ for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fdx16-0003ap-W7 for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:47 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:53125) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fdx16-0003aB-Ow for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:44 -0400 Received: by mail-wm0-x244.google.com with SMTP id o11-v6so2697282wmh.2 for ; Fri, 13 Jul 2018 05:17:44 -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=s3ZyxBxzau5fUOt7z7GIStSIk9FwlQTjG9bixKYj8iQ=; b=COiD+wWwpEHpUdrp4dTW/Qw4/j4j+VNtvD2lJ1+QKR5dZeyDJe3zXDWGQMkTBLE5tJ r1GdJF4hYFMEVrHruwrjGCv3URvVTxst9WgrbcSB/8V5koKRL0qxzZdx8ONFgRnCPPgn k5YRornG2CogykF7/jJ8RENMLXJmkT7bgNbIM= 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=s3ZyxBxzau5fUOt7z7GIStSIk9FwlQTjG9bixKYj8iQ=; b=XV9asJmJBElKMeBSyOdc8CWktusWlsvc4z+LGl1pOFd0R7HEkOEoTrPZu+hGaNV3Bp wF20MXsbiLBSpgnr/v1z4IAMNLzCfck6D+lYIkuUnQeK1+qfNgyNWZH8/Er2g2finr48 G9G2iImp8hhsiZTy0dos2b4xBRmoZq4wvCS3LdmOByqb5LpIW0SHzTODA+lOioQK6KKj FB7z5moCEiKfcdM7vVU/k1ZsTkjNpji8puX6O1QfjliNx0gLa6GpL/lCO9bxLjt712vN hh/jLdwD/FWbOIYSiu4QNmwMZr2+h4KOVTdIctY53uw2gxwWtShHpqe66wChF4x7Y139 YwcQ== X-Gm-Message-State: AOUpUlG0+3mVgtTD5BEPRGMs1oPG5hC53iynLoe33utAMRbo0B1M30WZ qIKnSrKBdCDiTMyjuYc/AU/P5Q== X-Google-Smtp-Source: AAOMgpd8NsGdF8yFlRYRWfxf7FSBBY00Ywk8B5qngK1r1ahDvxt4412RZhjzF2K0WaR9FB8CiaZkhw== X-Received: by 2002:a1c:b143:: with SMTP id a64-v6mr4145825wmf.114.1531484263778; Fri, 13 Jul 2018 05:17:43 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v1-v6sm6522923wrs.28.2018.07.13.05.17.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 13 Jul 2018 05:17:42 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 051B33E0323; Fri, 13 Jul 2018 13:17:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 13 Jul 2018 13:17:26 +0100 Message-Id: <20180713121741.19262-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180713121741.19262-1-alex.bennee@linaro.org> References: <20180713121741.19262-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] [PATCH v2 for 3.0 01/16] 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é --- v2 - minor wording tweak for more explicitness --- tests/.gitignore | 1 + 1 file changed, 1 insertion(+) 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 Fri Jul 13 12:17:27 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: 943484 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="PMQD1TBl"; 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 41RsNb2NwTz9s0n for ; Fri, 13 Jul 2018 22:21:19 +1000 (AEST) Received: from localhost ([::1]:36978 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdx4W-0006yQ-52 for incoming@patchwork.ozlabs.org; Fri, 13 Jul 2018 08:21:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57206) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdx19-0004lQ-JF for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fdx17-0003c0-RR for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:47 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:41038) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fdx17-0003an-KT for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:45 -0400 Received: by mail-wr1-x441.google.com with SMTP id j5-v6so18385079wrr.8 for ; Fri, 13 Jul 2018 05:17:45 -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=xd1ZuVsa+Q63HCf88J/IjlW/GOPv51c/YgO4fy3B5e4=; b=PMQD1TBlmNAnFpXV3ul+beaQiTD9AGYJwx0u5wN9orDtc5c3ZScVTDFTSVjtTvzN8i n8s5KJEd9EthTQtcyb81es7LbqDf4ZBhrexkWoz7Lzz8nma4XuYJKKIhDGZQJ8MXCrfh 0vM3S2P3r1Z7GhAkNgAM7mm+o64VUq7GMMkXk= 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=xd1ZuVsa+Q63HCf88J/IjlW/GOPv51c/YgO4fy3B5e4=; b=mlWSX0a/X1n05YlcxmdYEykRB/uu2/vFx20fpGs63i0M2mW1qZugicTl5j5VxeLvsD d4V8LfuF9UxuOcwOziz91AWSZHiDYmgH9qVWS8YgWHYR8N4bnk+ngeD5QccP4jtC2uJO nNaUkjAwR9+8JNZScbjhcgLYMGbE5VPH88gLRGjGaGVQz7dNDU7pE3+NlBYrJwQoYdIM 7tCXuVkDJzv2/naTjkEnV/q1Wsi7j0KLwgcU1IbmlQdW2BjxA93l3lMQEuzo4YLNJAMS 26wTz3KlznKG7lxBgERcWxhGAXcv7GO6i5zy0uz+wJUQGQfYKdQvd2dJGydZs+nkBlf/ 6Wcw== X-Gm-Message-State: AOUpUlHCy1Sa0fj3w9R+DEABWTZItfGYPGoLIc32S1JM36SmxUPOupwN IlseXXYlZ8nfUmmy9k5KsbMMiQ== X-Google-Smtp-Source: AAOMgpfD5Kl9cklQoWBpY5eL+DP8D1dL/0Z1PKIqIKVtUcCPpbv0duej7x86O/cZuq7lPVBEb2BqyQ== X-Received: by 2002:adf:f188:: with SMTP id h8-v6mr5084828wro.214.1531484264620; Fri, 13 Jul 2018 05:17:44 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id a17-v6sm21201793wrr.81.2018.07.13.05.17.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 13 Jul 2018 05:17:43 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 181FA3E03ED; Fri, 13 Jul 2018 13:17:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 13 Jul 2018 13:17:27 +0100 Message-Id: <20180713121741.19262-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180713121741.19262-1-alex.bennee@linaro.org> References: <20180713121741.19262-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] [PATCH v2 for 3.0 02/16] 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: =?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" 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é --- tests/docker/dockerfiles/debian-tricore-cross.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 Fri Jul 13 12:17:28 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: 943485 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="Fbe5RT5x"; 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 41RsPW5Ljrz9s0n for ; Fri, 13 Jul 2018 22:22:07 +1000 (AEST) Received: from localhost ([::1]:36982 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdx5J-0007e3-By for incoming@patchwork.ozlabs.org; Fri, 13 Jul 2018 08:22:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57210) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdx19-0004lS-K9 for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fdx18-0003d2-JZ for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:47 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:46461) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fdx18-0003bl-Ck for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:46 -0400 Received: by mail-wr1-x443.google.com with SMTP id s11-v6so24912478wra.13 for ; Fri, 13 Jul 2018 05:17:46 -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=KqUm7VU0BgnKVtC9GMfEIYWnhk06lOgvjbjud9kag+w=; b=Fbe5RT5xtaL1Um7P4vXnWOmSBIvZew/giIURby7OdntlqshUzMj1AWWF8g2+fHV/Vs 2qr1JKqP2yzHauoog2mznVP1rASOobfQf/Z2xVb6onGOr6wf8Rd+j+sdOBLBR2g6KerP ePLjlEp9EEzu2gJdK9mGPIfnm8zvjCU2lXph8= 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=KqUm7VU0BgnKVtC9GMfEIYWnhk06lOgvjbjud9kag+w=; b=HWvPU9F+HfWUn31MGtOvImHgevQ0ceUlCSgXkfmZNwVWM1OmRxgSVCl/5mHy4+GPHM lN5Qz4YJgZYQLnrgvJ7HX0MdUEGXRl35zEy+FW/CBLDG3nznTeGTMA/vvSR6gbGdEwM1 kFXrKz4gMmKXF9BN9JyECzvhGcIz/wLo1j84PG5bnnq4PrQnFjVf/T5Qfh1kE9peH7v5 QGBRRDdMNwHMUVfiaG4bg0+BJjMwkCOUQfJZ26BWS9aWghT7PjqHwabnUOROQkYL4DKG 2k/jvnQFUcXDpjjgCE8qi0uHAbkq4dIlv1xdmnGPN21evP5sNXr+TbbgmGjf+QGS2gKW Da2A== X-Gm-Message-State: AOUpUlGyTIz3iVI8706OeRj7OwCzibRZUrT3tHlFg5uRGcJLcPYHLLfA sb4l2xmtSPXN3i2cFD1b5csnbw== X-Google-Smtp-Source: AAOMgpe6hoWvawuwqYULdiuDimvBS450rWpZAbvp5vYtGpxaGXbvzpJ3c+IHXsJAfW6rh8Cs0HieJQ== X-Received: by 2002:adf:c44c:: with SMTP id a12-v6mr5011022wrg.20.1531484265351; Fri, 13 Jul 2018 05:17:45 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id i6-v6sm23355845wrr.10.2018.07.13.05.17.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 13 Jul 2018 05:17:43 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 2A6883E049A; Fri, 13 Jul 2018 13:17:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 13 Jul 2018 13:17:28 +0100 Message-Id: <20180713121741.19262-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180713121741.19262-1-alex.bennee@linaro.org> References: <20180713121741.19262-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] [PATCH v2 for 3.0 03/16] shippable: Build the TriCore docker image X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?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" From: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée --- .shippable.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.shippable.yml b/.shippable.yml index f74a3de3ff..9670b13f8e 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -25,6 +25,8 @@ env: TARGET_LIST=mips64el-softmmu,mips64el-linux-user - IMAGE=debian-ppc64el-cross TARGET_LIST=ppc64-softmmu,ppc64-linux-user,ppc64abi32-linux-user + - IMAGE=debian-tricore-cross + TARGET_LIST= build: pre_ci: - make docker-image-${IMAGE} V=1 From patchwork Fri Jul 13 12:17:29 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: 943479 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="Ap1mJgE2"; 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 41RsKT4WJrz9s2M for ; Fri, 13 Jul 2018 22:18:36 +1000 (AEST) Received: from localhost ([::1]:36960 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdx1r-0004ok-2g for incoming@patchwork.ozlabs.org; Fri, 13 Jul 2018 08:18:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57237) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdx1A-0004lp-Bi for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fdx19-0003eT-C0 for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:48 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:37426) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fdx19-0003co-4L for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:47 -0400 Received: by mail-wr1-x42e.google.com with SMTP id q10-v6so24910895wrd.4 for ; Fri, 13 Jul 2018 05:17:47 -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=iuLXyrPnRE4rW5eg+qwTCiglTBSrKh3Lyhji9XKfoz0=; b=Ap1mJgE2DGjZA2w33s5SjQHtf5Xpl/W38N3xJJPVDxwSPSytV4B1hHNN90qKilQVwA CmOmP4v3OtHv0Vx08hH/2Xou5ctNFcvK1vustXIMW8odoR4OHtqfE87M0GCSiOeS/zP/ DOEf2Swz0lZCtMrwOh2H2J4DjvJhe4S1ruPQQ= 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=iuLXyrPnRE4rW5eg+qwTCiglTBSrKh3Lyhji9XKfoz0=; b=j6TpCTS4uQwcOg4cSSqEpgpYHl0vFQXAhEBtrIYtqeavBh7MLJFPZdn0v9f6UI/f9K 3rzrpeoY8CunRaQa6dlSo95TtMiThz2Rw2HVSjg0KDW7HPRZfCT/mzksfwvaDQAl3geW ioRFbESI0cyH9UvqeIgi9cVO6eQFsj8lTJSYGjYZP/MrhIkhnBA8SGhFPuAC1vnRah8K S4E3P5miEWL16SiQ2YRJ8rVSsWvEN/L9WZiLEi4mi6maOef51Cc+TyX/uK5lHg52RHGx XmTAzULkqEt7Xsb99vnGshyBJOFMeCVyKNvteRhwMrtHMz9ft05Lt2e3iiDWYXHI2+Fi tdjA== X-Gm-Message-State: AOUpUlFLw/Ta4b5VYyJGygQKvp8EzxUrKKxYlz3tKmHtRJZE8IWjoblJ 5NlmRGcEmBVnULDfYFL9+lMTZA== X-Google-Smtp-Source: AAOMgpfD5zEgvk0Fg/lbI1wKNquB7cOpixx9VKZTqdmnQb9relxYOivDyD/N55QZs2mM97VTecoTFQ== X-Received: by 2002:adf:c00b:: with SMTP id z11-v6mr4541757wre.268.1531484266161; Fri, 13 Jul 2018 05:17:46 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y14-v6sm4982246wrq.45.2018.07.13.05.17.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 13 Jul 2018 05:17:43 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 3D41B3E06C8; Fri, 13 Jul 2018 13:17:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 13 Jul 2018 13:17:29 +0100 Message-Id: <20180713121741.19262-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180713121741.19262-1-alex.bennee@linaro.org> References: <20180713121741.19262-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42e Subject: [Qemu-devel] [PATCH v2 for 3.0 04/16] 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: =?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" 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é --- tests/docker/docker.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 Fri Jul 13 12:17:31 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: 943502 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="GDCvMe1S"; 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 41RsZ74dgGz9s0n for ; Fri, 13 Jul 2018 22:29:35 +1000 (AEST) Received: from localhost ([::1]:37032 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdxCX-0005ZG-6V for incoming@patchwork.ozlabs.org; Fri, 13 Jul 2018 08:29:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57299) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdx1C-0004mR-Gi for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fdx1B-0003i3-2r for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:50 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:44783) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fdx1A-0003g2-R3 for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:49 -0400 Received: by mail-wr1-x443.google.com with SMTP id r16-v6so24914122wrt.11 for ; Fri, 13 Jul 2018 05:17: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=geYo+8uA6PiLU4TfomqugeI05sb+kolIYglmvhXVCyY=; b=GDCvMe1SoyVF9aLwx29Q/fK9zD4e0QdjWYQgmPVVY2n+LMAaj4jMFSkbBfWUywH6X7 Koaj+262dimmwmHBpzF8b1hlLN8Mt9tqLJHCXzoCUoDKjmbZRsFy+7Xuqs97cWsPJ3M7 cuM9ZMGaBb0pRuYNZA2pCEIVDR7fPDgCLXLtc= 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=geYo+8uA6PiLU4TfomqugeI05sb+kolIYglmvhXVCyY=; b=o1xfxrEHNgoiwmkm8yjA7W10Z252tDPIXKKgnd4oQgLn13v/qiZz4hEuXcwU56+Mhi Rnbj0ZE2fyvModWsQRxA4vupFuZ6pMxAiiAIOXA1Y7DGWMPfqWGmzFG8nBKQJ+azH3Fn A7/D4EnyrtcR2R2MMUJYDUoyXldBOhwGE1qTjpZj/iY0o2DEDOfcDA5ynqJopib0e3P/ N5yamUJie0bhrl1BE9dBxRp4B2Iox8tKeOnbn9K6+VnTB9Y6sKXrKO7gW0Tzpi2ZFKJc YJm/cM73q4Ju45Rlntb0VhypWImphXdCKMuqw97kgGrZEQZPZXpvYAt5MAhp7g42KxWf MA4A== X-Gm-Message-State: AOUpUlGgK+N3+qnwYtLT3/TPAQZDtB9ktEFPfoLNkcjBvVqEDedbZ1pA spQqko+f44d/Yx8aFpCa+EptqUBkueE= X-Google-Smtp-Source: AAOMgpcZY8LXjnggrobaD3daJ0rNrJhly43UabOM0ZYiIA64k4ZL5LKs45YJWR7pVJcuNOTDxNMS6Q== X-Received: by 2002:adf:a14a:: with SMTP id r10-v6mr4612548wrr.104.1531484267904; Fri, 13 Jul 2018 05:17:47 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id i1-v6sm3696235wrq.69.2018.07.13.05.17.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 13 Jul 2018 05:17:43 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 67F8B3E0719; Fri, 13 Jul 2018 13:17:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 13 Jul 2018 13:17:31 +0100 Message-Id: <20180713121741.19262-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180713121741.19262-1-alex.bennee@linaro.org> References: <20180713121741.19262-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] [PATCH v2 for 3.0 06/16] 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: =?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" 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é --- v2 - add "move" to Let's everything in commit message --- tests/docker/common.rc | 10 ++++++++++ tests/docker/test-clang | 2 +- tests/docker/test-debug | 2 +- tests/docker/test-full | 2 +- tests/docker/test-quick | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/tests/docker/common.rc b/tests/docker/common.rc index ba1f942328..cfc620d554 100755 --- a/tests/docker/common.rc +++ b/tests/docker/common.rc @@ -40,6 +40,16 @@ build_qemu() make $MAKEFLAGS } +check_qemu() +{ + if test -z "$@"; then + TEST="check" + else + TEST="$@" + fi + make $MAKEFLAGS $TEST +} + 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 Fri Jul 13 12:17:32 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: 943494 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="UozXJeiF"; 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 41RsTF1ZHFz9s0n for ; Fri, 13 Jul 2018 22:25:21 +1000 (AEST) Received: from localhost ([::1]:36997 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdx8Q-0002Bm-SC for incoming@patchwork.ozlabs.org; Fri, 13 Jul 2018 08:25:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57389) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdx1I-0004p6-D6 for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fdx1G-0003rR-Rj for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:56 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:43127) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fdx1G-0003qB-LO for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:54 -0400 Received: by mail-wr1-x42c.google.com with SMTP id b15-v6so24955637wrv.10 for ; Fri, 13 Jul 2018 05:17:54 -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=AlTddQpaOXQWaw8ed9X7T+byMnYHXmjFINOkVJ22/bY=; b=UozXJeiFVqqDP1QjwZW1ce77DSKNlpFI9HAOBF0xJg/vCS7KGTjcPmfNiARhGuBGz8 sIrBQOmdpxD9RnmmrZxBEIp0o/+223UWJiC0TZZ27UBwnAPefVotaQ9HQbtSam0j+9kM kNL0/m/FaV+QtDkkZqBcZ3tTxOG7AlBMwePu8= 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=AlTddQpaOXQWaw8ed9X7T+byMnYHXmjFINOkVJ22/bY=; b=g/Vi8nNXzj51gg+90o8S/orQRA/An2fPVcv5FS1NOSdcUIZ7bVrHidHbxghadSxh3y vg0NhOUjGilEaxOrCvE0QgSXWOE1KYoXlPba084G9EttSmXG9pbJBAXEp0BGQpx+u0dZ 2uPPHRZI7TB130pTRr0mIZ5n62f/5qAhs1954sBkeeeHsYogIwwh62nhUw3fE53w5BdS SCa5kPfrEUmUXLgmwd9Z41scWcCICmDhMbQ3cCQXGkqa2Wap6g7Shu4TZR8JzBoc4nf6 scNdfvcwmvu0t7hzVfXtvmWEEGq5s/qC7r8NrxUidwHjFJHHz7/3pBlu6hzkadwzhrqY Csew== X-Gm-Message-State: AOUpUlGLDUsqUnlpwVEEaT+7CCUbLx0drR40ePY+MYn7UCEcDghfPW0t DNWiMcvqjLwStVnoC3tZh2Ee2w== X-Google-Smtp-Source: AAOMgpf2DvSPdyw4EYgHyfYqipDJkITfUvfX2M8l0pEz5qO4JEVBHJH6ZznaiNeVIqhq1xceiFIFyQ== X-Received: by 2002:adf:8e89:: with SMTP id q9-v6mr4793061wrb.261.1531484273693; Fri, 13 Jul 2018 05:17:53 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id w24-v6sm7544078wmc.15.2018.07.13.05.17.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 13 Jul 2018 05:17:48 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 7AB283E075D; Fri, 13 Jul 2018 13:17:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 13 Jul 2018 13:17:32 +0100 Message-Id: <20180713121741.19262-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180713121741.19262-1-alex.bennee@linaro.org> References: <20180713121741.19262-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42c Subject: [Qemu-devel] [PATCH v2 for 3.0 07/16] 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: =?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" 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é --- tests/docker/common.rc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/docker/common.rc b/tests/docker/common.rc index cfc620d554..6df431eb72 100755 --- a/tests/docker/common.rc +++ b/tests/docker/common.rc @@ -47,7 +47,13 @@ check_qemu() else TEST="$@" fi - make $MAKEFLAGS $TEST + + if type gtester > /dev/null 2>&1 && \ + gtester --version > /dev/null 2>&1; then + make $MAKEFLAGS $TEST + else + echo "No working gtester, skipping make $TEST" + fi } test_fail() From patchwork Fri Jul 13 12:17:33 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: 943499 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="DuCylhlt"; 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 41RsWY0KRdz9s0n for ; Fri, 13 Jul 2018 22:27:21 +1000 (AEST) Received: from localhost ([::1]:37016 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdxAL-0003m2-Nf for incoming@patchwork.ozlabs.org; Fri, 13 Jul 2018 08:27:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdx1D-0004mT-Qc for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fdx1C-0003lc-NF for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:51 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:38888) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fdx1C-0003k4-HA for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:50 -0400 Received: by mail-wr1-x42e.google.com with SMTP id m1-v6so12189585wrg.5 for ; Fri, 13 Jul 2018 05:17:50 -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=s1tjMEdyx3m/WM9lUdoC7txnYwG7NnrJqQuuANHk608=; b=DuCylhltaJfiWAPf8M8X+UZknOlC0QZAhhI8b4YKhznY1Er9nafTccMJ7Ux89A7vre 1LajoWmSRrabcp0Vr/4E3a6u3BIIoqPdv9scutwQ+8kiHJsnHW51CVqFMVgHztxBoG2S iuP3iN/XGQof2jOux3oW3D9Kq3uQAXQ7Qmo60= 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=s1tjMEdyx3m/WM9lUdoC7txnYwG7NnrJqQuuANHk608=; b=pwF4Qr3uyuIUF7UwbT0fyQ5pNKnW2YCwGaVfx9QicjyuijtseytAKblk9McQDP5Vl6 SgY8BMbPHfnNDuUzoM0SL3Ys6ZUuvk6af1xA2MOO6BvavaMLFfiE6op1bIG35ijImEKE 9/UsXtUrjbmPz0D032Nl/kt+gT9VQ6L+7EdkfP4+xd5joPd5Npu1lhr8zM/cWtrCVcIc ok7iBouzulgJbWJaQgDoxj5Az2igG8a4BR7P4jm3y0LTZijnu8ou0DLmG1+MYg5kPhgo L7IzF0EWa+y+ewj/ZmSKBe2WVi/mpvZF5z+HU4A/G2XQjwB1r4bruxG3ca+lpZmYu0/u rjKg== X-Gm-Message-State: AOUpUlH5IzfwrhT/0kMx5OVriWzRL7dFxlNMYTWNkubcBaVvO7zabr3v X4/GI1Q7MzMNDLDXHdqA+5YtNg== X-Google-Smtp-Source: AAOMgpewmGZMpB2X5XDEj58zOa1u2Bn1LybdhUIq9uETsmljjkW39vooZVd1byM54aQgqMaestIFVw== X-Received: by 2002:adf:f091:: with SMTP id n17-v6mr5044823wro.49.1531484269622; Fri, 13 Jul 2018 05:17:49 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y127-v6sm9760906wmy.1.2018.07.13.05.17.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 13 Jul 2018 05:17:48 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 8DB7A3E0775; Fri, 13 Jul 2018 13:17:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 13 Jul 2018 13:17:33 +0100 Message-Id: <20180713121741.19262-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180713121741.19262-1-alex.bennee@linaro.org> References: <20180713121741.19262-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42e Subject: [Qemu-devel] [PATCH v2 for 3.0 08/16] 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: =?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" 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é --- tests/docker/Makefile.include | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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 Fri Jul 13 12:17:34 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: 943507 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="Kjmx2mQ7"; 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 41Rscz5ZN8z9s0n for ; Fri, 13 Jul 2018 22:32:03 +1000 (AEST) Received: from localhost ([::1]:37048 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdxEv-0007PN-7r for incoming@patchwork.ozlabs.org; Fri, 13 Jul 2018 08:32:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57343) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdx1E-0004mW-Nx for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fdx1D-0003mo-Ks for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:52 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:35994) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fdx1D-0003lk-BI for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:51 -0400 Received: by mail-wr1-x443.google.com with SMTP id h9-v6so24934464wro.3 for ; Fri, 13 Jul 2018 05:17: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=U6GtpVtbDq17OA0Ei3lJ1l3+LBmH8b9w4i8EYqWsp6I=; b=Kjmx2mQ77KSpM1o8xRdJv5bQe5MjWEjmVkXOa7k1aMUhAg4E8w7s3eSsSIBoIFXGVt UQRjV/c50aqflosBdzSL40x0sRLguFHAe6VLR9yBoHP8R/VYXC6xL2epOOxyAbQTiUJv OxFXvTdoCBmB+503Mq8QwdC+6uXdClw1CPMzY= 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=U6GtpVtbDq17OA0Ei3lJ1l3+LBmH8b9w4i8EYqWsp6I=; b=TvtZU4qDrxn4/lrv42vRtcdCzB2tE8SmjAvNlmjn9fkPJ8yB+0QOibaMe0wMqXV/Dj VxZMoPczHq4SHgWMhANggU+QxqtFAItKo7MQuHv9oX0LyPclo7yMJJpCNQbYIfv150rX K2+DiUuMwymooTlGxbgSLVqt7DN6DbKgFoyy2xIfLGkI+TQiO5fTSUctmauN1xj+OEh1 wH9EjMb+uhzAjEZNs/cYnq8tgAb5UYam7OOvRPec6VhIr+mYzT75DZCv0AU8+lkLlKYE Nugo8NSxkH5tDdgyMyZfJOwSpbG+AgJ8ymPAQoO3Hz+wGjZvitvZamuQp4aGQdOg3Jme zIoQ== X-Gm-Message-State: AOUpUlHz2UeWJgiT2oyvqCQf8JxAANdbsuMpx5eoBllXaxvYb6PdD9A/ Q7Cj7imlaWeUEC0W5/kkSUp5bA== X-Google-Smtp-Source: AAOMgpfRZGswJj+qre00Ms7+UC1yjai2je8hJqQGFD5V7HM1OKR6ve1XwhNFP0zlO0OvUy0OUkraiw== X-Received: by 2002:adf:bbd4:: with SMTP id z20-v6mr4901504wrg.183.1531484270386; Fri, 13 Jul 2018 05:17:50 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o13-v6sm4757231wmc.33.2018.07.13.05.17.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 13 Jul 2018 05:17:48 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id A152F3E0783; Fri, 13 Jul 2018 13:17:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 13 Jul 2018 13:17:34 +0100 Message-Id: <20180713121741.19262-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180713121741.19262-1-alex.bennee@linaro.org> References: <20180713121741.19262-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] [PATCH v2 for 3.0 09/16] docker: disable debian-powerpc-user-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: qemu-ppc@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" While we can build we can't run the unit tests due to a missing system call (249 - swapcontext). This could be a code generation issue as other architectures don't seem to have this system call. Signed-off-by: Alex Bennée Cc: David Gibson Cc: Alexander Graf Cc: qemu-ppc@nongnu.org Tested-by: Philippe Mathieu-Daudé --- tests/docker/Makefile.include | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 09fb7db7fa..fe63aacf69 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -140,6 +140,9 @@ 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 +# Unfortunalty while we can build with this image we can't run unit +# tests due to missing system call: 249 which causes an abort +DOCKER_PARTIAL_IMAGES += debian-powerpc-user-cross # Expand all the pre-requistes for each docker image and test combination $(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES)), \ From patchwork Fri Jul 13 12:17:35 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: 943500 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="c6dIBPE1"; 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 41RsWw6lcxz9s0n for ; Fri, 13 Jul 2018 22:27:40 +1000 (AEST) Received: from localhost ([::1]:37018 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdxAg-000428-FE for incoming@patchwork.ozlabs.org; Fri, 13 Jul 2018 08:27:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57390) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdx1I-0004p7-DO for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fdx1G-0003q6-0X for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:56 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:53801) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fdx1F-0003ol-QD for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:53 -0400 Received: by mail-wm0-x242.google.com with SMTP id s9-v6so1304801wmh.3 for ; Fri, 13 Jul 2018 05:17:53 -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=xuGTdDm3QUQTf7D3BLWtPMdNmJ0jQ/xVW6mgIgF9oa8=; b=c6dIBPE1phj0wKHX4zvJHuda+jrpZyccGPxWNTPydiVzOBg0xsqxg83n/YKu0URdRn FxnJjgP/ojRCUUcyUsloHFc3jNwF8JuZOJj+qgSWFe7LifUTTNHM69jcLjL736oUIJH0 vXzzx1VznvAldU0vxotsxPAxQmjzL0Lt4t5js= 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=xuGTdDm3QUQTf7D3BLWtPMdNmJ0jQ/xVW6mgIgF9oa8=; b=biphfYDak+KtElh08T916cSyAfljcMqAxPRcfbD+IW/670doHH1lTXkml3+cY2DoBI Si47iLYiRqDOzUZpgVSTgdVSvfjFJSv09iiKUw+FiSIoXxDD6BRvovLkGF73WvFOPKqf ex99v0iIKhl5uVMyS4qCOUo7xqDMK/drRZ5nvKodrPSmMf8K4XsqMXvH8MM471D/5t1p 94RLzOYud2qMS8KwcYzaEnDCRqFXeFEl3/vqSHy61y9Zeon5fbo56r6NeuvHzS0jZTzr TR8c9+rEkVMTX+pV7F28mu/mdVUVW0sCwDk2bx1TWCvqpkEvnni9ibzcaxELKoL656uY yq8A== X-Gm-Message-State: AOUpUlFaBOSJO5M2uqSZeqTZCoePlgYFzCr/RHPNKT/y8nvn+whno5vV r+W9VTt/a3jy0x4upSy6XmMmUw== X-Google-Smtp-Source: AAOMgpekK0cInZwKgsz6xg8uuzL4KvObWJdq1nHK9q8FQpCqz/g7YtxOyxNnYnjFTXnBaaa9pVuZNg== X-Received: by 2002:a1c:5e48:: with SMTP id s69-v6mr3641405wmb.19.1531484272819; Fri, 13 Jul 2018 05:17:52 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b11-v6sm15998438wrv.82.2018.07.13.05.17.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 13 Jul 2018 05:17:48 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id B4E963E07B9; Fri, 13 Jul 2018 13:17:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 13 Jul 2018 13:17:35 +0100 Message-Id: <20180713121741.19262-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180713121741.19262-1-alex.bennee@linaro.org> References: <20180713121741.19262-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::242 Subject: [Qemu-devel] [PATCH v2 for 3.0 10/16] 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: =?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" 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é --- v2 - make script -e to error out on failure - add comment as to why the configure step is run --- tests/docker/test-unit | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100755 tests/docker/test-unit 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 Fri Jul 13 12:17:36 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: 943491 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="ko5icxWd"; 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 41RsRy123Wz9s0n for ; Fri, 13 Jul 2018 22:24:14 +1000 (AEST) Received: from localhost ([::1]:36992 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdx7J-0000tW-6S for incoming@patchwork.ozlabs.org; Fri, 13 Jul 2018 08:24:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57388) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdx1I-0004p4-Cg for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fdx1F-0003op-83 for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:56 -0400 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]:52412) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fdx1F-0003nk-1e for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:53 -0400 Received: by mail-wm0-x22d.google.com with SMTP id o11-v6so2697614wmh.2 for ; Fri, 13 Jul 2018 05:17:52 -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=lBP9QPie20XtTxSBnOWW8k2+GL1mfeqNCoiNavu2SL8=; b=ko5icxWdKWNcAT1Oz8gonbO9oDQKIq75NVL5oHzkZytRdQAY14tE7iYqJtwAPe/077 rsaOD9ZwGy6B+wKomLb2qvDQo3bucGdwZDT07XKHMVXUcrWVafj88jsbDBIjjBycMzXf Xpmvr8r6LXD7sPo3GXHELCoQNk68UqeTdnM7I= 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=lBP9QPie20XtTxSBnOWW8k2+GL1mfeqNCoiNavu2SL8=; b=dWBv8WMXFX1WGDfr3BjJSWCk+j0xrXxGH0A6wBC34AJbNR6L15QFT18AllD2n6XHyC wAnAmUBS+8hzdveotN1gdKCnKvgNorsQ4mVrq3Xgdl6zYcK85f/RUIdkEmtPxza6xarX zaIm+TS7Hv/QVrxpQdWKl4W6YGzu0oT8mWKgsmzxz9iDDsnTCY6L/uvhp4fdrZa8ySmP 3sKl5ziHV9zKtuqVFYagdk26+2l/gwrDLBlJGSMprkbYv4y+mAyAvnzV5wCnIsrY2yxd QJbZIgnho2bGhBtkFo+kMe/k6iIbkUC5hX6teaYYTeaHW2mtA2lWvIi7H2CRpCTTOCCB 68Lw== X-Gm-Message-State: AOUpUlESN2PSvNZgh7nbhVtGHiJCCPRr7/uTjmotby/4gT7HXrh1cKkc GERArHVNHjOwyxv/TukIPiH3Og== X-Google-Smtp-Source: AAOMgpcBzbJQi0TCbVdm1rNs2Pk26NbmQmk2Okt7jbO/5hqLEUmEzq21NP75dats2rQaGqF8S4UqLQ== X-Received: by 2002:a1c:84d0:: with SMTP id g199-v6mr4123171wmd.90.1531484271923; Fri, 13 Jul 2018 05:17:51 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 73-v6sm11470712wmu.37.2018.07.13.05.17.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 13 Jul 2018 05:17:48 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id C7E763E07DF; Fri, 13 Jul 2018 13:17:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 13 Jul 2018 13:17:36 +0100 Message-Id: <20180713121741.19262-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180713121741.19262-1-alex.bennee@linaro.org> References: <20180713121741.19262-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::22d Subject: [Qemu-devel] [PATCH v2 for 3.0 11/16] 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: =?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" 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é --- v2 - docker-test -> docker-all-tests --- tests/docker/Makefile.include | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index fe63aacf69..e32c35be0d 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -151,7 +151,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) \ ) \ ) @@ -161,7 +162,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 Fri Jul 13 12:17:37 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: 943504 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="VdW51k+P"; 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 41RsZy1yJRz9s0n for ; Fri, 13 Jul 2018 22:30:18 +1000 (AEST) Received: from localhost ([::1]:37036 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdxDD-00066l-5s for incoming@patchwork.ozlabs.org; Fri, 13 Jul 2018 08:30:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59913) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdxAR-0004I9-Qd for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:27:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fdxAO-00023g-MC for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:27:23 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:33029) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fdxAO-00022T-FM for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:27:20 -0400 Received: by mail-wm0-x241.google.com with SMTP id z6-v6so4411870wma.0 for ; Fri, 13 Jul 2018 05:27: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=fkW34Ukxv5r13E+snBuRqSy0q9jT96LqwwJjgNg8Gfc=; b=VdW51k+PQVvxZUOP5/k6oRoi9k+fHM1Qa78e72d1BpApfPCEx1tdWJoGtTr0NKM8NP 6r7bfxM45tMPCz187plT20StTAJWdg4Cg18fVkdtc198wb9PMCMQwNCKXyQ94jrwzF4d jSAqkpfDURZPnLWMG9EMbs532p3lG04+Fs2F0= 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=fkW34Ukxv5r13E+snBuRqSy0q9jT96LqwwJjgNg8Gfc=; b=N6nq26ed9rL7MyltIRPpnMwtjO/YIPTqbWbezL7kJo2csM66HcSQlKBgQyGJbD7uAP nZQPqJ9zYNcO4ESTnbmB0qukHNS2n4KRV0tMth4LvQcGCecnFYjMNk2xfuVXzatNQNs7 E/vyxnLhk/1gLkK9rJq1q5sBwEBofqG57XIIm5/i5Whmn3nTt2jWU/2TqSAW+/eO2UMk mQZfT/NAOiI52zfEhVj1IeIzRH8yd3+nND8uuoyyp/59HFW7oF/7AJx6o0dEAlQH+SL3 WprSP+njFJLRcxKG/k6tQRWa/KsHaI9umE4IPJIs1k1QPU/ieEsJDC/GURa6VZSozX6n uKeg== X-Gm-Message-State: AOUpUlGpT7mmrwuo8maY/3HaJbljlqL2CGRoh2th/+TEaYyxeLTC74HL xMRqUlULgn3s8P1oo96xLXd7Mg== X-Google-Smtp-Source: AAOMgpfPPojtpaSGR4D8LQqcckbJgIVRpi14sr0hMwZBn/l285HstJoKE6T+CoZqnpIfz6BeZnYoIw== X-Received: by 2002:a1c:93d2:: with SMTP id v201-v6mr1761597wmd.77.1531484839339; Fri, 13 Jul 2018 05:27:19 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id t70-v6sm1432729wme.7.2018.07.13.05.27.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 13 Jul 2018 05:27:18 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id DA7913E085B; Fri, 13 Jul 2018 13:17:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 13 Jul 2018 13:17:37 +0100 Message-Id: <20180713121741.19262-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180713121741.19262-1-alex.bennee@linaro.org> References: <20180713121741.19262-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::241 Subject: [Qemu-devel] [PATCH v2 for 3.0 12/16] 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: =?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 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é --- tests/docker/Makefile.include | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index e32c35be0d..ec23620153 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 Fri Jul 13 12:17:38 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: 943486 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="X6v5/fzW"; 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 41RsQ45vKtz9s0n for ; Fri, 13 Jul 2018 22:22:36 +1000 (AEST) Received: from localhost ([::1]:36983 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdx5l-0007zy-EH for incoming@patchwork.ozlabs.org; Fri, 13 Jul 2018 08:22:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57358) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdx1F-0004n3-D5 for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fdx1E-0003nn-CV for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:53 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:40948) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fdx1E-0003mj-5f for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:52 -0400 Received: by mail-wr1-x434.google.com with SMTP id t6-v6so24912507wrn.7 for ; Fri, 13 Jul 2018 05:17:52 -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=WltgY+ioPBVaA4MSIqyW/3VPytavaaSl8us8SORoE0o=; b=X6v5/fzWMpS7NnOYpBma38LouI2O9/EjUarMo28PauEGNpBxGW7xZ2Wyd7bsM6Bjp1 cZv5wGOYVjI+ijS6g5ylGH+zxdIEdiyxNN8tapCPYTwlOqFAT5mEjOtZgUY8Kx7NP4pW YxJO/+ViQk52Eaq+l4zYUHGVbl5YyOJvpESUw= 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=WltgY+ioPBVaA4MSIqyW/3VPytavaaSl8us8SORoE0o=; b=Y81ZFiFlcItr4tjMxAxv2KBS9V31fOB5h94riQ9nBovoYcPILjh6sB+COTaBjKjt/F BjPK6eU8M0GPES9Y/1Jn0QhUXsb5MshmDpXTPrO0fBLv0ed59XdCxQO9SOgwNy/YBcFt QjpKqtYKV+EB3/Bd8+lZle5MVw3cFNIEyUPVMuA8sAgp9imiLoNOHgnS5I3jjpqMuAsf rU5aYUjc2bEJSpPV5tmXEnXx9f/WBphUiwYjTek/pCcDd4w8r6BXr6wjZrJZm8KRm3cx J+bd0NWQLZjgWryHZwxttN9gZ16JlZfptgLb3P5XVElpMWHjTUieFn4hOHKgtD3IU7HL +aiw== X-Gm-Message-State: AOUpUlE0A11nzdSWWYNSCeH65xwUAyvK7fQlctrEWZ49pdZiXviOTRpm 2AEpIwjaD/KrtUdvsvAQnRZEqQ== X-Google-Smtp-Source: AAOMgpdGKQuEQapGdMpG+cKn2/78cQiinGZQV0O5HuDCojIdOrQnRhI1LKx11ix7k2n1bnoav8xa2g== X-Received: by 2002:adf:91e5:: with SMTP id 92-v6mr4252064wri.124.1531484271189; Fri, 13 Jul 2018 05:17:51 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id l6-v6sm5253739wmh.41.2018.07.13.05.17.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 13 Jul 2018 05:17:48 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id EDD793E08B3; Fri, 13 Jul 2018 13:17:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 13 Jul 2018 13:17:38 +0100 Message-Id: <20180713121741.19262-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180713121741.19262-1-alex.bennee@linaro.org> References: <20180713121741.19262-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 Subject: [Qemu-devel] [PATCH v2 for 3.0 13/16] docker: add --hint to 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: =?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" 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. Add a --hint option which we can pass down to give a bit more information. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- tests/docker/Makefile.include | 3 ++- tests/docker/docker.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index ec23620153..c9e412f9d0 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-$* $< \ + --hint "you will need to build $(EXECUTABLE)", \ "CHECK", "debian-$* exists")) endif diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 2f81c6b13b..523f4b95a2 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -475,6 +475,7 @@ class CheckCommand(SubCommand): default="checksum", help="check type") parser.add_argument("--olderthan", default=60, type=int, help="number of minutes") + parser.add_argument("--hint", default="", help="hint to user") def run(self, args, argv): tag = args.tag @@ -487,7 +488,7 @@ class CheckCommand(SubCommand): info = dkr.inspect_tag(tag) if info is None: - print("Image does not exist") + print("Image does not exist %s" % (args.hint)) return 1 if args.checktype == "checksum": From patchwork Fri Jul 13 12:17:39 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: 943515 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="CK0oBP/U"; 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 41Rsk21GF5z9s0n for ; Fri, 13 Jul 2018 22:36:26 +1000 (AEST) Received: from localhost ([::1]:37098 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdxJ9-0001yZ-MH for incoming@patchwork.ozlabs.org; Fri, 13 Jul 2018 08:36:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59914) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdxAR-0004IB-Qx for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:27:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fdxAQ-00025d-36 for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:27:23 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:34824) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fdxAP-00024O-S4 for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:27:22 -0400 Received: by mail-wm0-x241.google.com with SMTP id a9-v6so2405263wmb.0 for ; Fri, 13 Jul 2018 05:27: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=1MKzdoK/MCfbGVwnw3ruXmQEW5dlGctPyFI28rtTlgU=; b=CK0oBP/U2CAylKLEFwP4Pv2gg7DHJWz/622lzJkJywtEJqvb7kZJJk/oYnHCNcIw5g qRKUib6bkiH3/Rd1NYxYyp3vJVwKfBZzyJWKUnqeY7i0urYPHcNHeeWDcY1U71nUQ1AC x2hGEKBznzoCGn1XIsIjQN+4aRremcbLX8ISc= 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=1MKzdoK/MCfbGVwnw3ruXmQEW5dlGctPyFI28rtTlgU=; b=cLPoqC1BtKxKNcgouw+JVHqcRwlvSHG6l2MCAF0pjKgY3wtd3mxxm4FxEGMe0txIsK JScEfYo1yRj0TpxurqWvdy/L7MynrUTc7hluWvqaxMdWGpb7AySSWynPXY5ZYfwMXw54 FudfvzfgYDUVDBhH/5waOSP+izuC9iyW519mSpcAkCR3SPGqvmYAPD5TuCOyqKhwmaVB PLj4VtdMIXsLt4adX0/O5cKK/guBxF0XK7SWYlAU5DHP387rD+BZAT4G+wpa+kl0UVEt zyMvznpoA+nba8uZ0GXlPF0FmraxdBN+3fQbJxJ2d+6pLJEJosmrOFuPa14lJcCvIvjX 4Z/w== X-Gm-Message-State: AOUpUlGLPyMXLCaI5uLFe6/AeMawUucAiurCcCI2xO/Il06q1yRvne59 9cS7LWYvkjFR9Y+6bURUyaVJLw== X-Google-Smtp-Source: AAOMgpcFtkzaCnjY3MMkArYK4im7x9vPFeQIpGNEStsqsU4lIuSLnOyLHGM9nMLeeS1v2G9qEROS4Q== X-Received: by 2002:a1c:ec9d:: with SMTP id h29-v6mr3964190wmi.94.1531484840919; Fri, 13 Jul 2018 05:27:20 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id z18-v6sm21263354wrr.76.2018.07.13.05.27.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 13 Jul 2018 05:27:18 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 0C3623E0949; Fri, 13 Jul 2018 13:17:43 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 13 Jul 2018 13:17:39 +0100 Message-Id: <20180713121741.19262-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180713121741.19262-1-alex.bennee@linaro.org> References: <20180713121741.19262-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::241 Subject: [Qemu-devel] [PATCH v2 for 3.0 14/16] 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: =?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" 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 --- tests/docker/dockerfiles/debian-bootstrap.pre | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 Fri Jul 13 12:17:40 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: 943510 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="i4kdlOuB"; 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 41RsgX6RRNz9s0n for ; Fri, 13 Jul 2018 22:34:15 +1000 (AEST) Received: from localhost ([::1]:37069 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdxH1-0000VJ-4R for incoming@patchwork.ozlabs.org; Fri, 13 Jul 2018 08:34:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdxAR-0004IC-RB for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:27:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fdxAP-00024K-AC for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:27:23 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:34240) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fdxAP-00022p-3c for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:27:21 -0400 Received: by mail-wm0-x244.google.com with SMTP id s13-v6so4408889wmc.1 for ; Fri, 13 Jul 2018 05:27: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=i/8W9ViYkGFn+cSJ2UNXYPq4VCxUbB5XVHkWk2/3DAc=; b=i4kdlOuB/fug/AYPyDNgWrjJpH096sczJc3fyM4FBcwejF9RofuQOkLn1HxA/9SkWR 6UHA1Y2FbdludxukID9nHuxpaXlCUgGInMLzXWxx2O95+EDd/f7mWKEi0v8LtISMe7AP GTHFEHMxMayhE/KFA+Jb3esiUwEk6PhzRgbDM= 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=i/8W9ViYkGFn+cSJ2UNXYPq4VCxUbB5XVHkWk2/3DAc=; b=kfcYDZtyOkPwQMeYpYPeWnztyEB4R6rBocF3m/zAerr5H/gRcObJLoRH/fcdvE2ESs BJa504owOBzOGiX5vnY91heQAYAvZmwWxcKdr+PINCd2u/adkSfUwQWwJapTil/CnPh7 ujt6U/GAfxHkjl+d9PHAOSCkavQ9Ro9ICYTv1DkvFlL4qxFeTQHSO9K2tqj2JKMAIfZf zrGZpbZ4bLpY9bAWOAPddVGibq3BeggtAIiV6/+4gkjP+vfT/x+RIRLbidBP3fsqxTxK +QuNSd286BAYkysdwgQ4DdFBqRefjucV5Fo9033HDHFzUPrQ3C+ld5/nxZcAmYxwRvv+ mgBg== X-Gm-Message-State: AOUpUlGGJ60kr41Kr27f4c1F20b1M0PJ2iZsJ0NMCJFwqNUNdqzDT+s2 LNh8fx/MUPc2072Yxn1wnWQSYg== X-Google-Smtp-Source: AAOMgpeVZXmDidgmN9+yFAYyA/xQ61fzunVzVxW27Fj+wsUEjSCKFFNb89EyH/ETuxeKgQkJ8ZOeMw== X-Received: by 2002:a1c:ce0a:: with SMTP id e10-v6mr3543953wmg.135.1531484840033; Fri, 13 Jul 2018 05:27:20 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u4-v6sm18343643wrt.31.2018.07.13.05.27.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 13 Jul 2018 05:27:18 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 1F15F3E031F; Fri, 13 Jul 2018 13:17:43 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 13 Jul 2018 13:17:40 +0100 Message-Id: <20180713121741.19262-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180713121741.19262-1-alex.bennee@linaro.org> References: <20180713121741.19262-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] [PATCH v2 for 3.0 15/16] 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: =?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" 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é --- tests/docker/dockerfiles/debian-bootstrap.docker | 1 + 1 file changed, 1 insertion(+) 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 Fri Jul 13 12:17:41 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: 943501 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="Ytt5h3Yk"; 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 41RsXM47ZGz9s0n for ; Fri, 13 Jul 2018 22:28:03 +1000 (AEST) Received: from localhost ([::1]:37024 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdxB3-0004Kq-7h for incoming@patchwork.ozlabs.org; Fri, 13 Jul 2018 08:28:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59923) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdxAS-0004Ic-B0 for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:27:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fdxAR-00026n-4G for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:27:24 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:37088) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fdxAQ-00025t-Tb for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:27:23 -0400 Received: by mail-wm0-x242.google.com with SMTP id n17-v6so9264634wmh.2 for ; Fri, 13 Jul 2018 05:27: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=Wk0/gw3LtEHx/P7dGN1Ku+ZavBi7dRcefqJI6nV3CnY=; b=Ytt5h3YkzBSpRHA4lpQ3qal4zI99d04aAK6XwTo9OMONTDNAH9cjM9WFciuNCa3vXM TNBfndZ3/j3nAP5DXU6EQbrHZfpr/4D1urNfv0tLrU07huPXC9AQ8dC35x/Mf78mLlbh k0bIIw+Rv0zbo2Z+9rO7RR+DznS/a35rCrAGo= 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=Wk0/gw3LtEHx/P7dGN1Ku+ZavBi7dRcefqJI6nV3CnY=; b=YJBOgjQy5aYbLBoSWyzKY40xlAm8lO9hzXFGZcEtC3FUjtUt2ECnSpfQBTmMShJpE7 x2eIbBv+WlQKhh/ny2EBHHdKI01hmvQH4D5YmKmQwhMwuMriboQjPR2as7kdcd2IokiB UoHdaKwak3XNkPgiB4xVNXHtF8DGi198PHkucva3z1UY9uQsI66JrboJUW8rHTM4uJjG sm5/ZAMvbPjuotG3jkRXQGX2Oo4RbIT/oZ1KJ+2b5qp17TjLJr5oPbVR31G17d1ODIJ4 wbp2FiKRv6X36j1tVZstSdhsXARrfrS6yxEZVYhK5ec4ZOrDszwvt6jNr4JCpMr1rVEf pWSw== X-Gm-Message-State: AOUpUlFhWerheJDxZLSUYxcISwyihCyguaPvnO7hk2DkC1aW71Pzl8Zl U1iocOblP3JB5i6msB5Xz81f7w== X-Google-Smtp-Source: AAOMgpe9Z6jxTUcnCFbhj4iaqlFQWkzaAW3fgEWCMJcyWgyBPF8pLsBq3z5M6sLPqWpVqjINWWtj4Q== X-Received: by 2002:a1c:6546:: with SMTP id z67-v6mr3585540wmb.130.1531484841825; Fri, 13 Jul 2018 05:27:21 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o10-v6sm24716877wrw.79.2018.07.13.05.27.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 13 Jul 2018 05:27:18 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 330683E0969; Fri, 13 Jul 2018 13:17:43 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 13 Jul 2018 13:17:41 +0100 Message-Id: <20180713121741.19262-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180713121741.19262-1-alex.bennee@linaro.org> References: <20180713121741.19262-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::242 Subject: [Qemu-devel] [PATCH v2 for 3.0 16/16] 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: =?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" 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é --- tests/docker/dockerfiles/debian-bootstrap.pre | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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