From patchwork Tue Jul 3 10:14:25 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: 140934 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp977419ljj; Tue, 3 Jul 2018 03:18:02 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcsjd7YWFf7dL6+cKtmfXrS2Du2RAfP4FJIxej2dtp0B8EqlDNdM4T8auDKxQTDhnJHok4+ X-Received: by 2002:ac8:1abd:: with SMTP id x58-v6mr10604385qtj.180.1530613082209; Tue, 03 Jul 2018 03:18:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530613082; cv=none; d=google.com; s=arc-20160816; b=cFp7DPrP791wn+JqvYYmyCSTl2P7SEhf9O1MhY6Kbv4lLA6s+zeHODl+nfSJ1sxkyb k4oUi8GlrbG6eXP9lSi28NHNOy73MEnWxNCPKvNCbleddJcl1SG7ftnkplZoq/OdvSfj EEqAdsRb56CzaiEp0Hcd3LwKP6ykpmF7SESdj+3rspiKpSyO8FkXWfyTLr0jSChg+/aH p4GuhGc4WnqGnaaOQUvrL/BIYEJ7wrsv3rVz7gUKRoj7pOj/lXd4q45XoXqMZwLuGyBV vLNCub6Emr2T5ipn+/UKNDzYYyEH7T/SF/jFfSFbybUipx6LOl6XuDz2m6x7AjAL1i3s j1Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=dU3kq5psUPJEFUoqHyC++6Tir0Uw7eOGFEoPWFW0FRU=; b=fl4HIWKYYECnl7vqT1PUZwMEw6xYYI/ajzkAGz6CWtlLNYTdgffIDldtwHWuS5XNkW ZnN8gvr/qHeUcHlmFqSkrbwtlYDx5jZ6AGy8FCj3VDlsCTRNh01q2lSdj5YxblNnh00Z DeJXWXskljFSwXuJ8CsuSI90B8AaUksQHYzg0Nf1PHA5x4GwcBrL9Bcju92MXdqjzTsa 4IZ3wVG1lAdQvKAdmRuqYWUanmQA9GcFIeVcQMlunwIJ4ZqmoKKVvyMfQQ78VTRWklRT +OIOPHSiaRKBNMFJ3TF5NwBfp1k0ksmHcJ82eA1d6Fbx1o9J71seeH/ZqJ+zN8YDYPPf 9lLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DtpWrTEB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id d44-v6si699304qta.140.2018.07.03.03.18.02 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 03:18:02 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DtpWrTEB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39362 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faINl-00084H-HI for patch@linaro.org; Tue, 03 Jul 2018 06:18:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43419) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIKg-0006lF-Sm for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faIKd-0008NL-Tv for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:50 -0400 Received: from mail-wm0-x232.google.com ([2a00:1450:400c:c09::232]:52032) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1faIKd-0008Mj-Mw for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:47 -0400 Received: by mail-wm0-x232.google.com with SMTP id s12-v6so1713045wmc.1 for ; Tue, 03 Jul 2018 03:14: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=dU3kq5psUPJEFUoqHyC++6Tir0Uw7eOGFEoPWFW0FRU=; b=DtpWrTEBQlpmzn6p8fC6jCTKLIIKtK1UTOEZzGU2551ESDihl0z1O1XaUmiQAYSnOR zbH4I06bxWNrNpeWImtViA2Vs12EdYh9DDAOBbPRsGS+qjfYQjGv9H/XBrkh1Po7t28C 6H+i+4wfLz2t1CUUq4yYJqdyLAtX3wve+XjRs= 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=dU3kq5psUPJEFUoqHyC++6Tir0Uw7eOGFEoPWFW0FRU=; b=iUbFWVZ9gwUDk6RjYalZydTnSAoC2DQC9p1WaCpJQGLbDKSjYa89fvMrslXOfSI2sg cdLkiJ5Kb/DY34I7UJmAnl9+iT43q4jir+8xTd9v1wHc22NspogRffNQHce9LadX0XDm a7h2tiFTj3GHUzhwVbDALRRmnSWO/M/Vwrtc+PdGnGv9ILglViUhOtSosjFdELb1Sddn qsNkOEMTuIxHFW9/KLwQLfjJCF/8tOW25fIKiLbcvl90F27ippfoEQfRcgM3qcDYVSoB LU3waaSO8w8zGCR3tjjNr3lg02LJUg1hfvyKvRq3tjC5ZY6oyOSaEhXLbcM4xik/6yDz a32w== X-Gm-Message-State: APt69E1iYNy7E4Avr/j2tr3vvRsE3TQZCyp0WZ/AqrZ24yD3xBD3woGy Dd2MnxfDZXar+jy/M8ePWo3Y1g== X-Received: by 2002:a1c:d543:: with SMTP id m64-v6mr9829596wmg.12.1530612886660; Tue, 03 Jul 2018 03:14:46 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 125-v6sm1812572wmw.9.2018.07.03.03.14.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jul 2018 03:14:44 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 979B83E0274; Tue, 3 Jul 2018 11:14:44 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 3 Jul 2018 11:14:25 +0100 Message-Id: <20180703101444.23778-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703101444.23778-1-alex.bennee@linaro.org> References: <20180703101444.23778-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 01/20] travis: do not waste time cloning unused submodules 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: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Builds only require: - dtc - keycodemapdb - capstone Signed-off-by: Philippe Mathieu-Daudé [AJB: drop wget cache] Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé -- 2.17.1 diff --git a/.travis.yml b/.travis.yml index bd66c18fed..134d5331fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,8 +66,7 @@ git: before_install: - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update ; fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install libffi gettext glib pixman ; fi - - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ - - git submodule update --init --recursive + - git submodule update --init --recursive capstone dtc ui/keycodemapdb before_script: - ./configure ${CONFIG} || { cat config.log && exit 1; } script: From patchwork Tue Jul 3 10:14: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: 140933 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp977387ljj; Tue, 3 Jul 2018 03:17:59 -0700 (PDT) X-Google-Smtp-Source: AAOMgpePLLitl6Kh5DFJdJULWLIQrI746mLftaStwCeTAc+9eLax7X0HmbKD7LNACUB2U6a4F95q X-Received: by 2002:ac8:3872:: with SMTP id r47-v6mr3672591qtb.69.1530613079824; Tue, 03 Jul 2018 03:17:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530613079; cv=none; d=google.com; s=arc-20160816; b=yg174v3s8mhzfe4wFMfkiWis/ZTxF1bG7e9nutZ6hvWaQNVei2xeK3GBKeUoSMfum4 aQDeGFrYhymBAsyoex/SuFubO9241BUgyuBbuamWcQ6EwJnAh2/vlLjSvtq9I2/bbLS2 JoQ8maq2in4EfMYCY+W7lyjt/S4VV5LKI7MXlkJMwmx0Qtt2qn2mUnLmeVviw3xmSTji Pj01YG564V6b70w/QrQZtXbiLaHKPX9nif3ztb8Fwmi3fvSegsg5ovu2s7gr7yzXEhTp 9DsKVp0u/Rfs/m4v4eIwTKTHT+o5jwKbbW4qsEv4enLPonjKFIyjHDCt4tNuN615qMeD LooA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=8ZJIkp5peP8x948t3evAemzrXu2WEsnvEGJe0RgWHkw=; b=lMVcS/2xJb/H+E99pwPI3Dl5TAiaEDPR48BSNAOYmJ/+U81SFL6IJGPYHt7YVpt6Ic sEs/leam1UlpDGkoUvjfiVtq8+HHL7NUWIv3ZmAmk1yYod7h1fjaYV9WyFFIT08+F3Th 2UnALtofFfJW32XgV9tol+fAz5pKd19b5fe6f51St4ZzBB6Sdp8bmeu+hYt3wi0f+DXK 53PsMF0uTJ4HLyMjf5CJOvnHT4roSGVPItNhu0XRo+TBYrNpgu8NsuwZqXEnYrO9nkFN 31mPY0CAbitklcaOKmm6fSECOWx1U008C8BW3NLROpm3PXL8MW/+Dfad6IWyAuIit8Rj rhhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QAZRSKDe; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id x30-v6si757858qtk.39.2018.07.03.03.17.59 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 03:17:59 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QAZRSKDe; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39361 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faINj-00083t-8K for patch@linaro.org; Tue, 03 Jul 2018 06:17:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43421) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIKg-0006lG-Sq for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faIKf-0008On-2J for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:50 -0400 Received: from mail-wr0-x22c.google.com ([2a00:1450:400c:c0c::22c]:37778) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1faIKe-0008NT-RW for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:48 -0400 Received: by mail-wr0-x22c.google.com with SMTP id q10-v6so1356447wrd.4 for ; Tue, 03 Jul 2018 03:14: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=8ZJIkp5peP8x948t3evAemzrXu2WEsnvEGJe0RgWHkw=; b=QAZRSKDesdpSRFSqIU0RYWND5wYkf7ArroSYWb5NIK1rqhyrbiRJ1zjfuuA4IeyZ2K fwOiakQWLydxB6POts/1lgG9ha2OMJKhY2dlofcWgF3/vpz9TfBF4z67AUIFaLpsGac6 GrnP+XtbWa3AzR51jqXlliy/WFQAVkZCLJRB4= 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=8ZJIkp5peP8x948t3evAemzrXu2WEsnvEGJe0RgWHkw=; b=PdTfiqTxcR7b/I2yu+iU+pG5ez//Y8OlXQGAhcEYlabd4kDsXu7t+2RKHrNXCKqxSi Y7Z9kwL1F+WQSbRblBrFRi6mQgKKhVbIpTPdvyphmqdoOe5qWyc1vPFe2rLM2HNQ4yfS A4otLFNnBOBzwDrQTH253tTIFhHPC6IlhAau++QxeoO5VxGFxiDVQ2Lk4/b6CwplLB1P yuUbx4hJMCjIJReMQ/OdqAxqGlcP0LMWHNyXdDmnFt6V2m0HLpRCeAfAQlqQBhJtyZgM tRJ+q+Gu/F+f8gdu3MdBmEigu11FveLNHN7ZgwusjZIGkbW8ABDPIjo9YEOj42JNoNa9 BIVQ== X-Gm-Message-State: APt69E1cAiw5TIY4VyfS6WJUmM2664qYQBy39NIJXppSVKBNU/CsiO0X h7itwcmzuKuyB5D7jp3vaX8SDg== X-Received: by 2002:adf:9c91:: with SMTP id d17-v6mr14631065wre.11.1530612887791; Tue, 03 Jul 2018 03:14:47 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id d4-v6sm1028532wrp.51.2018.07.03.03.14.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jul 2018 03:14:46 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id AA8523E031F; Tue, 3 Jul 2018 11:14:44 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 3 Jul 2018 11:14:26 +0100 Message-Id: <20180703101444.23778-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703101444.23778-1-alex.bennee@linaro.org> References: <20180703101444.23778-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:c0c::22c Subject: [Qemu-devel] [PULL 02/20] travis: test out-of-tree builds 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: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Force one config to build 'out-of-tree' (object files and executables are created in a tree outside the project source code). Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé -- 2.17.1 diff --git a/.travis.yml b/.travis.yml index 134d5331fe..32188d51f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,6 +50,8 @@ notifications: on_failure: always env: global: + - SRC_DIR="." + - BUILD_DIR="." - TEST_CMD="make check" - MAKEFLAGS="-j3" matrix: @@ -68,11 +70,15 @@ before_install: - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install libffi gettext glib pixman ; fi - git submodule update --init --recursive capstone dtc ui/keycodemapdb before_script: - - ./configure ${CONFIG} || { cat config.log && exit 1; } + - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} + - ${SRC_DIR}/configure ${CONFIG} || { cat config.log && exit 1; } script: - make ${MAKEFLAGS} && ${TEST_CMD} matrix: include: + # Test out-of-tree builds + - env: CONFIG="--enable-debug --enable-debug-tcg" + BUILD_DIR="out-of-tree/build/dir" SRC_DIR="../../.." # Test with Clang for compile portability (Travis uses clang-5.0) - env: CONFIG="--disable-system" compiler: clang From patchwork Tue Jul 3 10:14: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: 140932 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp974850ljj; Tue, 3 Jul 2018 03:15:19 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe3S+r1wvCkvFIPYXTgmqHkALTFai4hyHLF/GRliAqBC2Yy1tgFP8jUTGW6E2Piv3RzrDET X-Received: by 2002:a37:2aa6:: with SMTP id q38-v6mr25619058qkq.270.1530612919061; Tue, 03 Jul 2018 03:15:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530612919; cv=none; d=google.com; s=arc-20160816; b=AXOCGKyPv5pyIEtSS6G9Z0Ve8p9bbylEBBj0KfMeGUUQmy4ir+oaW7cCRI8JYaB68U PJytaH0mEzdhgX3yVGYG9Y8vcC2G16Chqp4m7BqiQbvFuTtysh5zwvtAVso3+jIp0s6g D/cFvfs5U0BMjZCMD1ryn9+l1UrCBUq+rcfxaGFriiOlmYV5+dkOXaEiYsIlhCJ4ifxE cS89xLD7bD37G638V0Hru2A6ZlzL+/B73aQmWvtFGgYxpCzekvlF3iIBExvFcqNxyj0U IBG6vz9TahSE5OrkEfWlhs1oGRReqg4WnF9E+Q+JkDv+fsc5uoHIYQ2Oy7RJGfmZv90K AzPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=TExIbWBuPMbpYS2pp5+s5Fy8dg4pQC7MP480dwwVofo=; b=ZbxsAsLYGh68RpETZlxGHjiqHlrwhbl420w+ZWgI/EaE9D0FAtgIp1/ePKUP+4org9 skrPxJdLw4ARkq0mVC3Ata0sRoE7wE126JDfQXErBfEyI+yqrB2XoTlIcGZ8t1ZM/o5c sqVe/TCnCJueh53PAXXuFn7kEC7tN7UtihvrHwu2ZhlRbVkAkB8bgQLBELWVOjB8ZU1A iGY0N8V2jKJ/raxbZ3vLwGRsIwhfEHPO/RDXKICxBknRnNyx33Ifdz1ZkbIypUuljUzK QN+5zSf4ZGJf+4GnMlvZ790yeSKxlNospvI6byQg9rCGSZeqUmzzVw0d306LVmm3QvU5 xYjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=D74jbAFK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id i65-v6si706775qkf.384.2018.07.03.03.15.18 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 03:15:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=D74jbAFK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39354 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIL8-0006mz-DM for patch@linaro.org; Tue, 03 Jul 2018 06:15:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43422) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIKg-0006lH-Sn for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faIKf-0008PN-PR for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:50 -0400 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:52035) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1faIKf-0008OZ-Iq for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:49 -0400 Received: by mail-wm0-x235.google.com with SMTP id s12-v6so1713134wmc.1 for ; Tue, 03 Jul 2018 03:14: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=TExIbWBuPMbpYS2pp5+s5Fy8dg4pQC7MP480dwwVofo=; b=D74jbAFKMDfTYSG5x/XHMM8OP7KBrc59zObIDkwPKAzAn/bC+x3RtZDZ29VKSIAH8V WavnXuA+TnooJMiz2BzO/KQUZt5qS9MSbdb8PRJWBEGxEH1wwOV1pddvx+22RU0OWLtV GF+79cYaZp//0tiv5SnkeMkCnt8JYClpN/h8U= 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=TExIbWBuPMbpYS2pp5+s5Fy8dg4pQC7MP480dwwVofo=; b=cusr6IkM51i1cb17IkEfE729RprwG75YklY4VTKYaMC/UGN4S4jBfMZX9EEh9XEMQt I/NB4hFTjDrFpEd6BCkwq76ZRbvZZFdPfnDCcZRYlwJPwQvkNUiQg7LAbrHYMsSVwe11 XguUeaT2uiiMJ519Eji+ZysUhuUxSxuNSWZGn3OQTlCF1U8kvWEBn0KQgZ+gGpU8Yat3 f100xnjLsmzKBzaIk5CzBG4Q+yjqHQ+k3nvm9x6s+jlEOowK+H1gvYxBn7BfMclEO+Dq xOUUKzf3Nc4+KireuXhjeUzM4gN8DfOByQnuAxB7zfYvtJMrC2fV/AuZRTJibQwXePnB 1AUg== X-Gm-Message-State: APt69E3MXix+n9stNKlNxb/Cbzo1wzBDjeJRGzbl6hy7p41Cp9civGvq v5y9kG6bLAW9EL5oViXkuyiZ0g== X-Received: by 2002:a1c:6b51:: with SMTP id g78-v6mr11008283wmc.149.1530612888507; Tue, 03 Jul 2018 03:14:48 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 189-v6sm1670683wmd.17.2018.07.03.03.14.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jul 2018 03:14:46 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id BF0133E0625; Tue, 3 Jul 2018 11:14:44 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 3 Jul 2018 11:14:27 +0100 Message-Id: <20180703101444.23778-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703101444.23778-1-alex.bennee@linaro.org> References: <20180703101444.23778-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 03/20] build-system: remove per-test GCOV reporting 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: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" I'm not entirely sure who's using this information and certainly in a CI environment it just washes over as additional noise. Later patches will provide new reporting options so a user who wants to analyse individual tests will be able to use that to get the information. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé -- 2.17.1 diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index f33e5a8423..66ef219f69 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -158,12 +158,11 @@ rarely used. See "QEMU iotests" section below for more information. GCC gcov support ---------------- -``gcov`` is a GCC tool to analyze the testing coverage by instrumenting the -tested code. To use it, configure QEMU with ``--enable-gcov`` option and build. -Then run ``make check`` as usual. There will be additional ``gcov`` output as -the testing goes on, showing the test coverage percentage numbers per analyzed -source file. More detailed reports can be obtained by running ``gcov`` command -on the output files under ``$build_dir/tests/``, please read the ``gcov`` +``gcov`` is a GCC tool to analyze the testing coverage by +instrumenting the tested code. To use it, configure QEMU with +``--enable-gcov`` option and build. Then run ``make check`` as usual. +Reports can be obtained by running ``gcov`` command on the output +files under ``$build_dir/tests/``, please read the ``gcov`` documentation for more information. QEMU iotests diff --git a/tests/Makefile.include b/tests/Makefile.include index e8bb2d8f66..756474814a 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -891,26 +891,16 @@ GCOV_OPTIONS = -n $(if $(V),-f,) .PHONY: $(patsubst %, check-qtest-%, $(QTEST_TARGETS)) $(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: subdir-%-softmmu $(check-qtest-y) - $(if $(CONFIG_GCOV),@rm -f *.gcda */*.gcda */*/*.gcda */*/*/*.gcda,) $(call quiet-command,QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \ QTEST_QEMU_IMG=qemu-img$(EXESUF) \ MALLOC_PERTURB_=$${MALLOC_PERTURB_:-$$(( $${RANDOM:-0} % 255 + 1))} \ gtester $(GTESTER_OPTIONS) -m=$(SPEED) $(check-qtest-$*-y) $(check-qtest-generic-y),"GTESTER","$@") - $(if $(CONFIG_GCOV),@for f in $(gcov-files-$*-y) $(gcov-files-generic-y); do \ - echo Gcov report for $$f:;\ - $(GCOV) $(GCOV_OPTIONS) $$f -o `dirname $$f`; \ - done,) .PHONY: $(patsubst %, check-%, $(check-unit-y) $(check-speed-y)) $(patsubst %, check-%, $(check-unit-y) $(check-speed-y)): check-%: % - $(if $(CONFIG_GCOV),@rm -f *.gcda */*.gcda */*/*.gcda */*/*/*.gcda,) $(call quiet-command, \ MALLOC_PERTURB_=$${MALLOC_PERTURB_:-$$(( $${RANDOM:-0} % 255 + 1))} \ gtester $(GTESTER_OPTIONS) -m=$(SPEED) $*,"GTESTER","$*") - $(if $(CONFIG_GCOV),@for f in $(gcov-files-$(subst tests/,,$*)-y) $(gcov-files-generic-y); do \ - echo Gcov report for $$f:;\ - $(GCOV) $(GCOV_OPTIONS) $$f -o `dirname $$f`; \ - done,) # gtester tests with XML output From patchwork Tue Jul 3 10:14: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: 140940 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp982242ljj; Tue, 3 Jul 2018 03:23:28 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdi2RZhJZOuuAmjqO3GZdhcQ9SgdsmMmthhJIAzZoWPdiH3LK7leJLC74j52jjxAs2XxQJo X-Received: by 2002:ac8:962:: with SMTP id z31-v6mr27111250qth.179.1530613408904; Tue, 03 Jul 2018 03:23:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530613408; cv=none; d=google.com; s=arc-20160816; b=YWuZgeMpbavINMYB29xYUd+/kmGcr/sZ8mw+2G+vRtt7OPVdoPru9/VwqR/y7XJ61C Z9swXR8MkB2VuaLAC3O94di1B1Iefm15j9SAdXGPFiAsXSWPxSUNngAdgsIWbiY62Cfj V0zegBpcYtAay6A7gQ1/P0YPTxgXE4YgXyJMjyOsftgUV3faou0NniGTd5Rb1wwPhqi5 lMki5JbKcDzUVMLUcylEhfLJOY2l1+YPqOOcqL8AEpi9yVdQIG4avB+dZIaq6galxVcK CEWz9R5x0FjKSUQvizB+rNgKDlxSqHHbVqHN4BRgBhtVw1YPuRCRvItU0xocKYMFu1pZ qr/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=+MykUc49ZuBBKYZS74ihd7UuNP3+o35TThPInQ61l7Q=; b=ceJXCe6RozltKUahRlVJcF4ZlwOTACKm1LQ1X6Cg8OoAAOXil1eRGe1ybHzfxUg8Go Gs6k0ZBZz9rcimfB4dJ5pWDSmJ+RjPU/TXZJj4y6UNFWjNlDxGID3Dap2HHyjZbtBUhA h4lq46/5up7SSOGb05blfoI5u763I+MiYUitlLgWuzQtVq1Dk0S569gBd/9dtrmv4gZn EqUrjiANOeE/CiMZZaUZsTXlKN2EwUaNZnCBvfaGfcGWd3agYyy6+6rHXbeLyyApyzqN CA8laU+Kq4xG/sU+jkdCtvUbyCg3aaR3kh63TNWaoZOkhWDl2Z71OL3zoKWJUX8pAEJw oF5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PpPJMvqr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id t188-v6si738158qkd.327.2018.07.03.03.23.28 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 03:23:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PpPJMvqr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39391 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIT2-0003nc-7g for patch@linaro.org; Tue, 03 Jul 2018 06:23:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43466) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIKj-0006li-8A for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faIKi-0008Qy-Bg for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:53 -0400 Received: from mail-wr0-x232.google.com ([2a00:1450:400c:c0c::232]:37784) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1faIKi-0008QS-5w for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:52 -0400 Received: by mail-wr0-x232.google.com with SMTP id q10-v6so1356603wrd.4 for ; Tue, 03 Jul 2018 03:14: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=+MykUc49ZuBBKYZS74ihd7UuNP3+o35TThPInQ61l7Q=; b=PpPJMvqrKfbLVL4isRaCHl57fIRUMJZQUXIsOl5J3KcxIKAuJk17Jv5RrKdBNvQRzW SSoP6ZfEx9Eh249cXp5s+yScsKfqxW06G+IvuG7BkYDDxOFaJJattBNRV03fSMfuyiJU 7y88Nv3bkNtpZvInWF454gCwTbDNnlDfrkk9w= 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=+MykUc49ZuBBKYZS74ihd7UuNP3+o35TThPInQ61l7Q=; b=oSTVj74HTnCGSUUUioD40FeqkrF8P22+ZgCppJrYt8Jy/RIoAFRPMCRcAchv6VfsCF E+0fogJfuKVOGvlxuJ5hQ+AgjLtLsLnQQSu+oCnEffnrJwgLAcUdfUt2uSlQzHHRk1zU lcTeFUUFOFom13LS99bbtzLLYhZj4OYgQPRG0ZSd6eyX7BSb+awNi0VL9tIu0fdU0nTI XAe4B2lg2xbAaDTLMNQN/+v90kWcXACoIPmnLXVg4SWgeomQV2WaljEXYFCfDrLvFnhY amkvlw9ZGhA3mhjlBqRejkJz7sITTFSB4F2WyIm6+Wzs2PPtyVeH5xw7UjwZvvJZOXA0 UmMA== X-Gm-Message-State: APt69E0OKNNRzqQSuzFAfCGmDGegm8Bsomo+TdU0HPAywqQdLyMlBNls nbDyMwtFfeFVg/V4gVVaRXBLTQ== X-Received: by 2002:adf:8f2e:: with SMTP id p43-v6mr19800647wrb.193.1530612891190; Tue, 03 Jul 2018 03:14:51 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id t10-v6sm628847wrq.74.2018.07.03.03.14.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jul 2018 03:14:46 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id D21DB3E0684; Tue, 3 Jul 2018 11:14:44 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 3 Jul 2018 11:14:28 +0100 Message-Id: <20180703101444.23778-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703101444.23778-1-alex.bennee@linaro.org> References: <20180703101444.23778-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:c0c::232 Subject: [Qemu-devel] [PULL 04/20] .gitignore: add .gcov files 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: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" These are temporary files generated on gcov runs and shouldn't be included in the source tree. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé -- 2.17.1 diff --git a/.gitignore b/.gitignore index 9da3b3e626..5668d02782 100644 --- a/.gitignore +++ b/.gitignore @@ -155,6 +155,7 @@ .sdk *.gcda *.gcno +*.gcov /pc-bios/bios-pq/status /pc-bios/vgabios-pq/status /pc-bios/optionrom/linuxboot.asm From patchwork Tue Jul 3 10:14: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: 140937 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp980019ljj; Tue, 3 Jul 2018 03:20:56 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdxeHNXIfl6xUQiaxufVtXMWjw9Qm8b4/L2Hz3TvTf8TJUfqe7CHYbKNcNpV1hRfpiYcC4e X-Received: by 2002:aed:3cae:: with SMTP id d43-v6mr26577976qtf.379.1530613256318; Tue, 03 Jul 2018 03:20:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530613256; cv=none; d=google.com; s=arc-20160816; b=nNEZUpVSuaVfKWKvkTrr0XGBPxJztL5ieSmYQXg8husIwoc16GW9uCvCmV60FX6nx1 Pg3VrDMYVNyFmAsEgL3XM0mRQBGSj1HUyxkhsajHn+vYXShdJZDznvCNBZ8RP5AYZfHK PcWgMCPOtrCONA1bJ1xL58rcjt1txdirai1NgA/fAaKFspIpk1+ng19YW7YVKLqfdofm WI8WYjLzbJTyIXaJoh/ORXA/XRfs5d+LYTMSgFSQC4dDTJ/BFCQ+9C5IWf0JWl+AV+LT XNt1bj3dsnPTTk6R9fM0gNywRbdNzEQYYkzPxH9FTtcvjG8C3ii9pZ4jelGBhIcs3mU/ mtUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=gpl/6hMFpV7z7OvIAzMr3CHr7aFmzLYlBvnM1evaF9M=; b=b06qngzq00lOMGz2LNBf6IWUHYtczyWsmzLgbutiOPmR8ZKYDsvzFTBdj6qiFC2kaX VZSa3SiCxLVArhaDRv+WfprD0oJFB1M6h+xQrvlDlCSqscft3eSyz17IaC/r3wxQKLsS 4hOdWx2ClJPfzoWlS657imj61wmWkF3HcCtw/XSjr/X83UsxGxJrKfi8Zbmc73FLMGfa iX5+gQgB1gT4NBuND+w+8xGw9zY1+tS3k5/FaXyfUFQDJX/Ql0gln/ryR4TI2ul/pSo0 t/QuVTb1iV221aoYDDb7EZ5LopSsgq7KSFHPYoYa8c/rBKvqKipZ7/Z9oPxC4f6pskYL p8NA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bDJJ+aeH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id r81-v6si756118qka.26.2018.07.03.03.20.56 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 03:20:56 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bDJJ+aeH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39375 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIQZ-0001mE-Pw for patch@linaro.org; Tue, 03 Jul 2018 06:20:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43431) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIKh-0006lJ-Hn for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faIKg-0008Pt-Ja for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:51 -0400 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]:52036) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1faIKg-0008PL-Cg for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:50 -0400 Received: by mail-wm0-x236.google.com with SMTP id s12-v6so1713187wmc.1 for ; Tue, 03 Jul 2018 03:14: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=gpl/6hMFpV7z7OvIAzMr3CHr7aFmzLYlBvnM1evaF9M=; b=bDJJ+aeHvJh+QEWoBF3aIQ98DD/Z2X4pWsgPZyX+afaoRYt8uxq52xCO2a0xEX89NO 9QmMhI6iRORr6ddq1H0mKO9KA/UcLeP9ySc3QgHatWj1eneu8QXO5Qe6ZQiJahwDOmU5 YwHDaiaWro94lHz0IYT+EaLDKPkjdXuu6m1MU= 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=gpl/6hMFpV7z7OvIAzMr3CHr7aFmzLYlBvnM1evaF9M=; b=S56MyidLnueeknOUc06bCpRocUf0I/BJJayCrht+OKizaPHnZ3NCwM0mR8bFFgRBRm 2/+ls9ITh1pu6u4e6YjqJKP03zv56C7zLreZUcAvAwUPpzBkLOwFFYO+WuclWQ7gg7yY B1+xYfNh4KtJXO4+qlmQIJhzZoVTUk0oRsummqliVZsrKslTMbstHxGmK4oEEjIE1PRp 9u953ofiDyjfckN+QuA0fbmnDhHuzyWY7d9XMWVwl7gBDLygJ3qDwTpAVfcjlQjJdp9t q4t6pob6jSK3q57kL0fePI2B+J1JNl+kjj+EbdXU0g7IxLFpMHFo7e35BKY1zMQGMPiv Wyog== X-Gm-Message-State: APt69E1MMTFaFCYfmNpLot0wsHlqrDrnfsg/LJLqlGtKSOt3d4ASx76H FydP0SlAP0b3Ql5vJm9w+mL1yA== X-Received: by 2002:a1c:6d9a:: with SMTP id b26-v6mr4787392wmi.74.1530612889329; Tue, 03 Jul 2018 03:14:49 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c10-v6sm1815186wrh.44.2018.07.03.03.14.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jul 2018 03:14:46 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id E4B193E06A6; Tue, 3 Jul 2018 11:14:44 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 3 Jul 2018 11:14:29 +0100 Message-Id: <20180703101444.23778-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703101444.23778-1-alex.bennee@linaro.org> References: <20180703101444.23778-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 05/20] docker: add gcovr to travis image X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Useful for debugging if nothing else as the gcovr on the Travis images are a little old. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé -- 2.17.1 diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfiles/travis.docker index c5ad39b533..03ebfb0ef2 100644 --- a/tests/docker/dockerfiles/travis.docker +++ b/tests/docker/dockerfiles/travis.docker @@ -5,7 +5,7 @@ ENV LC_ALL en_US.UTF-8 RUN cat /etc/apt/sources.list | sed "s/# deb-src/deb-src/" >> /etc/apt/sources.list RUN apt-get update RUN apt-get -y build-dep qemu -RUN apt-get -y install device-tree-compiler python2.7 python-yaml dh-autoreconf gdb strace lsof net-tools +RUN apt-get -y install device-tree-compiler python2.7 python-yaml dh-autoreconf gdb strace lsof net-tools gcovr # Travis tools require PhantomJS / Neo4j / Maven accessible # in their PATH (QEMU build won't access them). ENV PATH /usr/local/phantomjs/bin:/usr/local/phantomjs:/usr/local/neo4j-3.2.7/bin:/usr/local/maven-3.5.2/bin:/usr/local/cmake-3.9.2/bin:/usr/local/clang-5.0.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin From patchwork Tue Jul 3 10:14:30 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: 140935 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp977921ljj; Tue, 3 Jul 2018 03:18:39 -0700 (PDT) X-Google-Smtp-Source: AAOMgpehGMj4CPdfpho+873+bhXYs5SFGtByZyU0cUIYywawsBtfddOjk2YSO7FtLKUkIzRrvDmg X-Received: by 2002:ac8:1b0e:: with SMTP id y14-v6mr26793927qtj.349.1530613119796; Tue, 03 Jul 2018 03:18:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530613119; cv=none; d=google.com; s=arc-20160816; b=YNSa//NLnj4hq7HtP3Ki1CGMWu/fsbb5Ei7wle9MQXEGpdogylXfzCYoGymx1c78xg NmYxrD/cxbuvPYci1YJPgFFLTOhvEPZGyJMTJvldXn0/8y36NC5bFQIbWzmWGwGI5bAl C0nqY8SGtlpVwKYaNKnqt0lWEJfEjpYHTF0J5mHp4MDpvw6ZCL18B46XIdsFQSDuewfc 19xk0yVB1WiQ+8EF7dFyevXGty9FZWycKQ6WIxkaPmCfQB0qyvYHcZ8nNlVJSKXvfruE VoK3J8fdiuuMUA2MbiGx36LeiA4vqA9LWp4nOHKepeLuDLoUt+h3qxEcG05CcBJ2/fKZ Bxug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=/ajiyM6W2S6tJAn/1lUSMSycGS8GwJG/ZBTtG/HLQ+4=; b=edt+ViFJmSEuPSzEo/urO+kvgDomXxHuSym4kVuHNa3Cj3EtMl8mXrAF+t85+u6ZUr 8/iXHEXvzNaABBhvsVDiClSGnpelH7IiSAfijG/+teGeN6ZA1Sn3XewN0mTG3/0tM/uQ LibtnFd+JHZd8AnlIKtEbFgPd7t11PgtiQg5cLeET9bFnzPMZOCZYl3icOMX6RRaKHCX 8MxzeGFOhb6/dU04C9uRlytIuwNNLyyPYFwQHmoHtfmCHoukVTrr7pydiSyOqlopsiSc eqB77hTfp0+FjCNd3NKx8A+p/k5eeol/0sLF8J7oEp34sJlV5IJ4909ayWCZ0iLWQWaC 0lVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=arn5ZCtj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id z127-v6si766861qkz.199.2018.07.03.03.18.39 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 03:18:39 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=arn5ZCtj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39370 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faION-0000nF-85 for patch@linaro.org; Tue, 03 Jul 2018 06:18:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43460) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIKi-0006lh-Mm for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faIKh-0008Qc-Kb for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:52 -0400 Received: from mail-wr0-x22a.google.com ([2a00:1450:400c:c0c::22a]:38665) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1faIKh-0008Q4-De for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:51 -0400 Received: by mail-wr0-x22a.google.com with SMTP id j33-v6so1363669wrj.5 for ; Tue, 03 Jul 2018 03:14: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=/ajiyM6W2S6tJAn/1lUSMSycGS8GwJG/ZBTtG/HLQ+4=; b=arn5ZCtj5FOEINodn9+Cx0hAGe+kMFkjB12iqbPZKyPgEPUzAF19g9N6rCB3vkIHDE 2f4MiAbgHVAaRBYVJvXF/R0eDzkeFBCZsHxR0SWdcbRFdgsMwanJWBCBtmoWZiv3Nd1S Qota/DhDa0VFgELxtBOD0lgG2IVz6DqjcS6Z0= 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=/ajiyM6W2S6tJAn/1lUSMSycGS8GwJG/ZBTtG/HLQ+4=; b=mCwffahJFhVZpXirUr6i695gLWke7YJxTGlF1g0J297qhYTlIjTzodKyfjETxOf/12 VDWcvxFFkDiWUmWqbqYbG1vgRQzrYV9fC/TcO6OpQznbcUrUghxQAHHh1B8AE2WoqH27 g5KBPtrz53xzIjVmc/jUFR9jastVIR6BneNpIXEXtmPvirjS/I3tmdGaGv7T9EV2uptN EYmJbwW3pEXdcFKcjTcaG3cS2tMuwF50x8rLptKC4OtfyrIXSvXoJbfoeWaPSkXgEouc NT0o7Uwywnr1uKEwCGDiuOFgPGkSuYCoLXvYyUiSafo0X+nJjRpto9eFSN6NtDo6NqJk bQaA== X-Gm-Message-State: APt69E1e4Bv0/RMBrPcfIIsUnTeK9FH3L0ONLkO+OZ+XuMhTB66lKyP8 +dXLkZ1T25sHBZMoH89WXS5rVQ== X-Received: by 2002:adf:d181:: with SMTP id h1-v6mr21877866wri.198.1530612890409; Tue, 03 Jul 2018 03:14:50 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c128-v6sm1171208wma.17.2018.07.03.03.14.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jul 2018 03:14:46 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 055C73E06DE; Tue, 3 Jul 2018 11:14:45 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 3 Jul 2018 11:14:30 +0100 Message-Id: <20180703101444.23778-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703101444.23778-1-alex.bennee@linaro.org> References: <20180703101444.23778-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:c0c::22a Subject: [Qemu-devel] [PULL 06/20] travis: add gcovr summary for GCOV build 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: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This gives a more useful summary, sorted by descending % coverage, after the tests have run. The final numbers will give an idea if our coverage is getting better or worse. To keep the width sane we need to post process the file that the old gcovr tool generates. This is done with a mix of sed, awk and column in the scripts/coverage-summary.sh script. As quite a lot of lines don't get covered at all we filter out all the 0% lines. If the file doesn't appear it is not being exercised. Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé -- 2.17.1 diff --git a/.travis.yml b/.travis.yml index 32188d51f1..95be6ec59f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,6 +38,7 @@ addons: - libvte-2.90-dev - sparse - uuid-dev + - gcovr # The channel name "irc.oftc.net#qemu" is encrypted against qemu/qemu # to prevent IRC notifications from forks. This was created using: @@ -86,6 +87,8 @@ matrix: compiler: clang # gprof/gcov are GCC features - env: CONFIG="--enable-gprof --enable-gcov --disable-pie --target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" + after_success: + - ${SRC_DIR}/scripts/travis/coverage-summary.sh compiler: gcc # We manually include builds which we disable "make check" for - env: CONFIG="--enable-debug --enable-tcg-interpreter" diff --git a/MAINTAINERS b/MAINTAINERS index 42a1892d6a..4917b8e48d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2165,6 +2165,7 @@ R: Philippe Mathieu-Daudé L: qemu-devel@nongnu.org S: Maintained F: .travis.yml +F: scripts/travis/ F: .shippable.yml F: tests/docker/ F: tests/vm/ diff --git a/scripts/travis/coverage-summary.sh b/scripts/travis/coverage-summary.sh new file mode 100755 index 0000000000..d7086cf9ca --- /dev/null +++ b/scripts/travis/coverage-summary.sh @@ -0,0 +1,27 @@ +#!/bin/sh +# +# Author: Alex Bennée +# +# Summerise the state of code coverage with gcovr and tweak the output +# to be more sane on Travis hosts. As we expect to be executed on a +# throw away CI instance we do spam temp files all over the shop. You +# most likely don't want to execute this script but just call gcovr +# directly. See also "make coverage-report" +# +# This code is licensed under the GPL version 2 or later. See +# the COPYING file in the top-level directory. + +# first generate the coverage report +gcovr -p -o raw-report.txt + +# strip the full-path and line markers +sed s@$PWD\/@@ raw-report.txt | sed s/[0-9]\*[,-]//g > simplified.txt + +# reflow lines that got split +awk '/.[ch]$/ { printf("%s", $0); next } 1' simplified.txt > rejoined.txt + +# columnify +column -t rejoined.txt > final.txt + +# and dump, stripping out 0% coverage +grep -v "0%" final.txt From patchwork Tue Jul 3 10:14: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: 140936 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp979993ljj; Tue, 3 Jul 2018 03:20:55 -0700 (PDT) X-Google-Smtp-Source: AAOMgpd0wHUC6zmuTGcDy1DTf95EjMlIuCO7AZWZZsjwtEPiI/hB6bFiip9KulJEk+O5DIZGCOi3 X-Received: by 2002:a37:ba02:: with SMTP id k2-v6mr4343172qkf.134.1530613254991; Tue, 03 Jul 2018 03:20:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530613254; cv=none; d=google.com; s=arc-20160816; b=DeYo6qOJvdHsy2S3xsStgXILVroxf8H4wCEah6Pb4o6+e+4WMikOtED2adzR1Vxq33 9dbOFqOBePxXx2DNsxerUFJKLaTIWIuOZbgRx9Uh1fU4yqHXrBhq/SqvtYCxnBYUXscK wWwU4m0Aa6Bctoym2+eHrqSYQBQbHCsNy0r27HgV5X5pB9LaRd3zYFka6FJDvw/sgD/U vYhLzckSTCY/aHz50p1u/6+vp944uaO6rpKa0CVW4FjCL3RPsXXviSn5Dn3IRLSnl80F ha4ooSQ++RkLdXUSyJVRmpW8nizzP2Bl7An5waLhM7WX7Bztjs23kmCzHGNdgLoKL+4p zl5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=dHZxRKyiPUBhXVfPlqFP9d1eZISw6Y+nFi4nQn0fk3c=; b=VC8yzwMk59XPCoA98VoVBTfaGToFr96zF2HGFxmpVi5xPUElG/s6EKm9FelmFsp9Zo ERv/HP3V15C09EPEbAfJbBuULI5T7HzCo20BEJU96Yho7dBT2edwmLwN3TEPmepuOz4x PrArSm7tqj/xHvODvZXcyrGXKh0r8LtnKOdcLx4nN80ceSTfXfMn3fetN836Opj8fqZR 0bvHom8GR3ZIRVmIOpRCV5frR1nYG36NrxR8BlYbroEh+z59xt8BoB322HCeU87HEtJf jq8fV1py70r4lijejigfkogHxKqWae8oLil5hydzw6A5zMz9VQ9tc2jKigFVLRA0pPcs CWYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=WLfyo5sr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 65-v6si754675qva.191.2018.07.03.03.20.54 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 03:20:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=WLfyo5sr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39373 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIQY-0001jW-Fc for patch@linaro.org; Tue, 03 Jul 2018 06:20:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIKl-0006mv-Et for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faIKk-0008Rr-Gz for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:55 -0400 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]:37855) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1faIKk-0008RS-9t for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:54 -0400 Received: by mail-wm0-x22c.google.com with SMTP id n17-v6so1654675wmh.2 for ; Tue, 03 Jul 2018 03:14: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=dHZxRKyiPUBhXVfPlqFP9d1eZISw6Y+nFi4nQn0fk3c=; b=WLfyo5srbY68ASPYok/5QgB1j/TdWPGYfZy6c5Mb0BPpyX8KwUmIjk5Jhjv4WiPavy Wi8ZfaggzEIzCL7mrcow/Q4Wmp2KX8JW5ljXrbaBY6KOtIydfZTtq/0OffU3CAnVU5fU gichoCMYh1nQO/Ke5L0XRZuZ4EoQCKSdKuzwc= 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=dHZxRKyiPUBhXVfPlqFP9d1eZISw6Y+nFi4nQn0fk3c=; b=jPpNQV04mPVeHWL7jurdGmsyrS4lvSvnE1z9fffoMcNzhtdtmiC7KWRuHOUajtguDq olo4deqL2jfuotnq7vs8q8o+DlUwUheUXjbbIiXUNSSyEGQB38I1+dGZipy/xa9mNZ82 54t9YwWPqYEMvZR84JauoniL8o6CdNvmxIEeKv+zXBONkRGlMnG0nMaLHJd6+fnTdjG/ WEqxDtppADXviJXAL7FCtts6UiiQ5ccdvUZrGsR2EjdTmi8mF8S20SR9Q5KIg37gB2gR QJh4RQskgqHZ+NVF5Ib+RoMOr40cFt4A+CME9xho+3d5V8pHels01FQipgputGfIaMOA ttXg== X-Gm-Message-State: APt69E1AkyWL0f/xuiC/V8vR2rl+aB5OD1HqOAM6S+rZHSOqNcE8oVuR 3gu73n3up/Yg2R5H+RHwdBncUg== X-Received: by 2002:a1c:6902:: with SMTP id e2-v6mr1658132wmc.95.1530612893190; Tue, 03 Jul 2018 03:14:53 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 74-v6sm2071088wmt.0.2018.07.03.03.14.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jul 2018 03:14:51 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 193B03E0719; Tue, 3 Jul 2018 11:14:45 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 3 Jul 2018 11:14:31 +0100 Message-Id: <20180703101444.23778-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703101444.23778-1-alex.bennee@linaro.org> References: <20180703101444.23778-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 07/20] build-system: add clean-coverage target 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: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This can be used to remove any stale coverage data before any particular test run. This is useful for analysing individual tests. Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- -- 2.17.1 diff --git a/Makefile b/Makefile index 7ed9cc4a21..2b3413a5ba 100644 --- a/Makefile +++ b/Makefile @@ -723,6 +723,14 @@ module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak $(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \ "GEN","$@") +ifdef CONFIG_GCOV +.PHONY: clean-coverage +clean-coverage: + $(call quiet-command, \ + find . \( -name '*.gcda' -o -name '*.gcov' \) -type f -exec rm {} +, \ + "CLEAN", "coverage files") +endif + clean: # avoid old build problems by removing potentially incorrect old files rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h @@ -1073,6 +1081,9 @@ endif echo '') @echo 'Cleaning targets:' @echo ' clean - Remove most generated files but keep the config' +ifdef CONFIG_GCOV + @echo ' clean-coverage - Remove coverage files' +endif @echo ' distclean - Remove all generated files' @echo ' dist - Build a distributable tarball' @echo '' diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index 66ef219f69..7f04ca104e 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -161,9 +161,14 @@ GCC gcov support ``gcov`` is a GCC tool to analyze the testing coverage by instrumenting the tested code. To use it, configure QEMU with ``--enable-gcov`` option and build. Then run ``make check`` as usual. -Reports can be obtained by running ``gcov`` command on the output -files under ``$build_dir/tests/``, please read the ``gcov`` -documentation for more information. + +If you want to gather coverage information on a single test the ``make +clean-coverage`` target can be used to delete any existing coverage +information before running a single test. + +Reports can be obtained by running ``gcov`` command +on the output files under ``$build_dir/tests/``, please read the +``gcov`` documentation for more information. QEMU iotests ============ From patchwork Tue Jul 3 10:14: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: 140939 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp982208ljj; Tue, 3 Jul 2018 03:23:26 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdiM/KJQ/FOhn4ui6jB2bZky+fiMvlk2OgQ0uGhnFEYBbBpV7nLK2ERdBXB/xLEnMacqk28 X-Received: by 2002:a0c:becb:: with SMTP id f11-v6mr18956645qvj.217.1530613406681; Tue, 03 Jul 2018 03:23:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530613406; cv=none; d=google.com; s=arc-20160816; b=uNV0hgGf8jQ+Nq9EgXFRE0mWVOG1rs5H8E7GGs/vEghRIr9KeiormjqD2olCnEbQqy lMmAxxMi/QSn5M2XJ4XQujvA+B//PC6uHxkIV01e9sCmJtGp+hm4EvCxyJVqleZRvmyp n9hrqshXjQuqcYwwbD0K5pjNMq1CqbA6i9vjzmotDAtGCru/bzllEfjs6FAyRMqEEN2e xlmA6i4MdlEocKpDYtTudQ9xl8NaJi4OSi/JKUZ6hyQNgsexQ8cjn23Ow8OcITRui17U NLFQrC5h2xnOLH+LNn6jZCUuMVpuCyFVEZ575mAnh1sqPstyWJz61yE5P3vkbogKaurc HH+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=gH9kwGR/d3n3ZZtMKFuV2Io0FY37dkTA4ZArazBX2eY=; b=JcqZLMFWaOmdv+pr2e+X/9fZALXzUEYoM24NIriLP25dNyOPI2HndEQT5QWH1A/GDy 7Bums6yQgqLaL0df3whVKb9Q5yZmBqYAKZ+yvTl1NUZvttfN430W0R81XEGhxVguM5fr zS2YWHliP9q9G7EdQGcvQ65loF5JDZSAtz0Ck6kG9LQBvGysnBBHWJ+0sh6r+J5cDSeb KLnAdOIDhi/BwjAU7ZTHIKkh6DV0E2PaJdZhFGkqolUJ4x/fa1lBDl640zNI3SIHschd HLRKnMI7mXtGRMTBzar60b/0aGLyd1i9FbENErzeLPYM7xy+pL81PS95+0Ie+b9wZeN0 ohgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=K+JnYA11; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id s53-v6si749589qts.218.2018.07.03.03.23.26 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 03:23:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=K+JnYA11; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39389 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIT0-0003lW-3A for patch@linaro.org; Tue, 03 Jul 2018 06:23:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43496) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIKm-0006nX-3I for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faIKl-0008SJ-6U for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:56 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:50715) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1faIKk-0008Rl-W3 for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:55 -0400 Received: by mail-wm0-x242.google.com with SMTP id v25-v6so1718104wmc.0 for ; Tue, 03 Jul 2018 03:14: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=gH9kwGR/d3n3ZZtMKFuV2Io0FY37dkTA4ZArazBX2eY=; b=K+JnYA11+GnoMQe2fvTqf9Pega97OWhKg+wWs7lePpbEZBl0HOGyX02+Q0QkzCv46h QxHeUP/CoR4pzDRo4RUTPDm5DujI2venShGQ9wGfArOCdJ7riKb2DhqodyzbbjKQLU3m ULuwDAH4+hNYDGcIaZTr8gVKYx6Uf72YZQlWA= 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=gH9kwGR/d3n3ZZtMKFuV2Io0FY37dkTA4ZArazBX2eY=; b=aqAaXp0LWRxIxyUN1rGjsxp3iXPA4COqeNWIJ1sqaLbIda3WQ0ldoauoT48MiPL7VF WkvuLjJd+NszDiJz4pxbeQ4Psd/82Gu098cclK70DYYhWagDsH6oxd6yH6azV+XRtaaU 9wwhxtP4XVOLKZSCRpo9mYP5mmuIW8hrH/TLR4QfgJlStBBeB+yXRwdEmOxCW6D2fkz6 Dqs77rY/tJUNEEPnsf0xNj5Ihqo3kLb2xh2NRXnNDEcYr5COhwQrsQ4aJohEnx2FDMfh OqqkMbSeHqJMl51cMWHK4IJymyaYxcgO642cvkmzs0qxKIs51Ux+2AiXpcibi5Qb80gc wVYg== X-Gm-Message-State: APt69E10NqGAiqB41YFmNF3jizDRZnDnVSC6x3NGr65VRd0FGr7K6KB4 rGi4sZiwX2HbAQodh61f23iU9gqCeMM= X-Received: by 2002:a1c:9c0b:: with SMTP id f11-v6mr10380057wme.148.1530612893898; Tue, 03 Jul 2018 03:14:53 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v9-v6sm1278459wrn.97.2018.07.03.03.14.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jul 2018 03:14:51 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 2C7A53E072E; Tue, 3 Jul 2018 11:14:45 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 3 Jul 2018 11:14:32 +0100 Message-Id: <20180703101444.23778-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703101444.23778-1-alex.bennee@linaro.org> References: <20180703101444.23778-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] [PULL 08/20] build-system: add coverage-report target 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: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This will build a coverage report under the current directory in reports/coverage. At the users option a report can be generated by directly invoking something like: make foo/bar/coverage-report.html Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé -- 2.17.1 diff --git a/Makefile b/Makefile index 2b3413a5ba..68af7b5d7c 100644 --- a/Makefile +++ b/Makefile @@ -986,6 +986,16 @@ docs/interop/qemu-qmp-ref.dvi docs/interop/qemu-qmp-ref.html \ docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7: \ docs/interop/qemu-qmp-ref.texi docs/interop/qemu-qmp-qapi.texi +# Reports/Analysis + +%/coverage-report.html: + @mkdir -p $* + $(call quiet-command,\ + gcovr -p --html --html-details -o $@, \ + "GEN", "coverage-report.html") + +.PHONY: coverage-report +coverage-report: $(CURDIR)/reports/coverage/coverage-report.html ifdef CONFIG_WIN32 @@ -1095,6 +1105,9 @@ endif @echo 'Documentation targets:' @echo ' html info pdf txt' @echo ' - Build documentation in specified format' +ifdef CONFIG_GCOV + @echo ' coverage-report - Create code coverage report' +endif @echo '' ifdef CONFIG_WIN32 @echo 'Windows targets:' diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index 7f04ca104e..5e19cd50da 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -166,9 +166,14 @@ If you want to gather coverage information on a single test the ``make clean-coverage`` target can be used to delete any existing coverage information before running a single test. -Reports can be obtained by running ``gcov`` command -on the output files under ``$build_dir/tests/``, please read the -``gcov`` documentation for more information. +You can generate a HTML coverage report by executing ``make +coverage-report`` which will create +./reports/coverage/coverage-report.html. If you want to create it +elsewhere simply execute ``make /foo/bar/baz/coverage-report.html``. + +Further analysis can be conducted by running the ``gcov`` command +directly on the various .gcda output files. Please read the ``gcov`` +documentation for more information. QEMU iotests ============ From patchwork Tue Jul 3 10:14: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: 140945 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp985062ljj; Tue, 3 Jul 2018 03:26:54 -0700 (PDT) X-Google-Smtp-Source: AAOMgpehOJBOMeVYW5p4wPNkCCEurXrAOKvmyHNdLKhkkLzF5cdpHwY/fI485iW27VbSV5Jizjw+ X-Received: by 2002:a37:5944:: with SMTP id n65-v6mr24778138qkb.107.1530613614335; Tue, 03 Jul 2018 03:26:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530613614; cv=none; d=google.com; s=arc-20160816; b=WWzalBFruv/RFbh6OQE5SJjL5Mk/e2XHn8WmV5VEmTpan5sBjhwO9YYAwe1kdlB6R2 snlz/VKtpwcCBBNoYff9L6mWAE8zagCRNI17o7KwqYraxTt1/RMUQpaspcwMZ/028J1P gZc9cKrTmqwLh5ekgTpUvQ6wF0wAF+GB9cqlWp9V2mOAwzbC171k/BYQBY8bebgcdBgb h7r5bEI4DcbZcLuOGizw7eitydrKtaCLjEY+re0SBniS12dW32FD6yRmNRhIyH+5QnNZ M8p4FIac1IogBI1Ed2w2SPgXi7nw1BSP3RXAP4m79SX95gMkw7LOGXzXkqag/wj0Ghj8 wWUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=AfY5DmZl1nsD/9JCMVOXNICjaUk2SH6MlpnIGM/R6mA=; b=nvwScXU6d4NV21Tg7z22sFIrX0v/lOgZFKrdKlfog0RwDrVYKK8J/nCkcP0qvS1ADu Fu0cfq3/s4D183U/X5960OyUvKEKGFXCal/kHeS7m19afqrvK5S2Kqou+3Yy4th3UURh Pw2I9qV8LGrvRNs2IZFvK7sbSuNK/SttMZxCgNjndzkw4lS2Xt8dPJbHAGn1RlWA/ZEv V94RwI/jXayNMnIe+hA6f1JLeunkMjV8bOCQ+bAO5lcyiOswrXdL2jqEBvES5NPFUfQP lwXyaEDWWIXuTqFdXSO70d+tCmM8yWgS9FL1GWOvIYoEv3d2hpWjFEB2dOplrJqELOxu CYrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="cr4Y3TK/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 11-v6si758728qtr.171.2018.07.03.03.26.54 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 03:26:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="cr4Y3TK/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39418 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIWL-0007fb-OC for patch@linaro.org; Tue, 03 Jul 2018 06:26:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43524) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIKp-0006r7-7N for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:15:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faIKn-0008TX-4M for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:59 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:41709) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1faIKm-0008T4-Tw for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:57 -0400 Received: by mail-wr0-x244.google.com with SMTP id h10-v6so1357047wrq.8 for ; Tue, 03 Jul 2018 03:14:56 -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=AfY5DmZl1nsD/9JCMVOXNICjaUk2SH6MlpnIGM/R6mA=; b=cr4Y3TK/8IadOC+aBOArAmH+skup2CR5iGiCAnfvBUfJK2N4a8KSJFGj7via+8F0zl 3LTyI0aC65ITJSi3Npuu8ovxrts3bRFp4zy70WVu1KowkarEWLchD7A05MDaMXwTcCNv gnJSvmhJIdxjBIXhJUjwQZBeV3HzC0DFEsgXI= 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=AfY5DmZl1nsD/9JCMVOXNICjaUk2SH6MlpnIGM/R6mA=; b=ZIlM50pcdhRDa0U/QAYsPIIOc44B11O9IzIEHr/c0BC2G1RDg5l9LLmKCjoPVgI+Yv Y29SlriKvwumIrLFpY2znQXLwnYZ88W3Z5y53tFzumx/gzWpajyRT6CnV0K4LpAj2ECI +SFn9u96pKwUuVDJyeIdfWerJDZhX7DNW8Ly5DyQaHSKGSzC4v7+x1GAUDbGu0VZij4M 0iDpbtxt1C67DIvGicx4nBPub175GQXVIEh58vA/5dDoqOG+O4ju73g12xYuVfVnUIy6 MMnQ+kujbz0f0IWZo8ollx6TekSao/ecOvfQKWt1vGJZKMf4dhT9coZEGo1c24+uaq/o 9fJQ== X-Gm-Message-State: APt69E0HnyWJ+zumrk043PqnMVGKHfWaI1VCHdcMfQw0xoTKCz3kiiPt jLOHXkk/mOMnNcGGs/M713JFng== X-Received: by 2002:adf:b964:: with SMTP id b33-v6mr23440546wrg.265.1530612895862; Tue, 03 Jul 2018 03:14:55 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o4-v6sm1163893wmo.20.2018.07.03.03.14.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jul 2018 03:14:51 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 43D773E075D; Tue, 3 Jul 2018 11:14:45 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 3 Jul 2018 11:14:33 +0100 Message-Id: <20180703101444.23778-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703101444.23778-1-alex.bennee@linaro.org> References: <20180703101444.23778-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:c0c::244 Subject: [Qemu-devel] [PULL 09/20] linux-user: introduce preexit_cleanup 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: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , Riku Voipio , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net, Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" To avoid repeating ourselves move our preexit clean-up code into a helper function. I figured the continuing effort to split of the syscalls made it worthwhile creating a new file for it now. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Laurent Vivier -- 2.17.1 diff --git a/linux-user/Makefile.objs b/linux-user/Makefile.objs index 59a5c17354..b5dfb71f25 100644 --- a/linux-user/Makefile.objs +++ b/linux-user/Makefile.objs @@ -1,7 +1,7 @@ obj-y = main.o syscall.o strace.o mmap.o signal.o \ elfload.o linuxload.o uaccess.o uname.o \ safe-syscall.o $(TARGET_ABI_DIR)/signal.o \ - $(TARGET_ABI_DIR)/cpu_loop.o + $(TARGET_ABI_DIR)/cpu_loop.o exit.o obj-$(TARGET_HAS_BFLT) += flatload.o obj-$(TARGET_I386) += vm86.o diff --git a/linux-user/exit.c b/linux-user/exit.c new file mode 100644 index 0000000000..aed8713fae --- /dev/null +++ b/linux-user/exit.c @@ -0,0 +1,28 @@ +/* + * exit support for qemu + * + * Copyright (c) 2018 Alex Bennée + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ +#include "qemu/osdep.h" +#include "qemu.h" + +void preexit_cleanup(CPUArchState *env, int code) +{ +#ifdef TARGET_GPROF + _mcleanup(); +#endif + gdb_exit(env, code); +} diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 793cd4df04..bb85c81aa4 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -623,6 +623,14 @@ static inline int is_error(abi_long ret) return (abi_ulong)ret >= (abi_ulong)(-4096); } +/** + * preexit_cleanup: housekeeping before the guest exits + * + * env: the CPU state + * code: the exit code + */ +void preexit_cleanup(CPUArchState *env, int code); + /* Include target-specific struct and function definitions; * they may need access to the target-independent structures * above, so include them last. diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 2117fb13b4..7c66442357 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -8018,10 +8018,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, } cpu_list_unlock(); -#ifdef TARGET_GPROF - _mcleanup(); -#endif - gdb_exit(cpu_env, arg1); + preexit_cleanup(cpu_env, arg1); _exit(arg1); ret = 0; /* avoid warning */ break; @@ -10127,10 +10124,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, #ifdef __NR_exit_group /* new thread calls */ case TARGET_NR_exit_group: -#ifdef TARGET_GPROF - _mcleanup(); -#endif - gdb_exit(cpu_env, arg1); + preexit_cleanup(cpu_env, arg1); ret = get_errno(exit_group(arg1)); break; #endif From patchwork Tue Jul 3 10:14: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: 140938 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp980448ljj; Tue, 3 Jul 2018 03:21:24 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeafAXLM+faU95ssrvwPc+ww0V+aKduWlA1geYW5RWqQrlBsDt91g9SGwYI8U+vZx68UoDp X-Received: by 2002:a0c:96eb:: with SMTP id b40-v6mr660967qvd.235.1530613283926; Tue, 03 Jul 2018 03:21:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530613283; cv=none; d=google.com; s=arc-20160816; b=HNa/pkl8RUEB/Dpe6mFbbcgdKvyz7yFiNs+j41NKmyWgBUK7gwyhL8Gi3OJOv8Da0r VuwpshezYudXL1PWRCA1KekzVa70qsrh/1MxxTqs5hsaloOfG0xvE9F39Kyrvuhin31V wbVU33P67EAlLFb6sE04eUtCYPi7zlRUn1gpCl+Il6Fvltck4m5TCjD50TccVcK55g5G JY0eLi12eFLHw4CjOM6EcKmMyRWR9O+tx+T4u2eBmOtKWhfVBID02C79VuaGhWZc4XKE EuMvOGqkK6usY6HN93Qaw4JFUe/vavPbLWRDG1FB+X5JtQeCgKZK/n8ClYVdmuS983HL 7O4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=26jHJcKVZxrJ3kF/okCbHv+dP0VTbKpXYEPZSYP8zmE=; b=Qy3SO7tTmb2PVPopSQfjjFdXM4LPpHkjlJLUakAbZTfDYp70iP4LS1QWp+XEMPeglf pyIH60NSUGexDyvyrSpw3at+uJGZrmPQzj3znwRV69kVaQqQxARDImqhFdCf6r3VvTKX 1zVE731XFFGLrVcFeDhCJKngL8IuD1nKOdjTmqeMK970EAhQf7bg3IBB7raHhhNPlzfl pEJfnpq1hASf9MSCcoVlXi0JRRz88fkuGan8LLfveBUYlqCBYs0tFhqwytNPjhpmkKql 2tTS6OLuxVuRS4OdyDJUg7YTnVIghiL42ZHfuQe8bO/tLBZ/3t/v0Wc2N+FCwzWRpwfd iQWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LyC7JrWd; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id d39-v6si941409qkh.36.2018.07.03.03.21.23 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 03:21:23 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LyC7JrWd; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39385 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIR1-0002mZ-Bp for patch@linaro.org; Tue, 03 Jul 2018 06:21:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43523) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIKp-0006r5-6w for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:15:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faIKm-0008So-1U for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:59 -0400 Received: from mail-wr0-x235.google.com ([2a00:1450:400c:c0c::235]:33251) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1faIKl-0008SH-QC for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:55 -0400 Received: by mail-wr0-x235.google.com with SMTP id k7-v6so1371274wrq.0 for ; Tue, 03 Jul 2018 03:14:55 -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=26jHJcKVZxrJ3kF/okCbHv+dP0VTbKpXYEPZSYP8zmE=; b=LyC7JrWdRKWgk/bIlifu6Yuwgnd2EGeHICkF/xAK6+oY/mX84kUCeAZ8NVbP6t46/K hWKuevwX6QXVvXuVqpgOuqZNFCGOEP2paJUSDYlt3CKY2S5J94ukVMFhTgoSI18D6lWg NhoSKyYBe5EwwVeu5GGlslKNJXht2wTBdFQHM= 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=26jHJcKVZxrJ3kF/okCbHv+dP0VTbKpXYEPZSYP8zmE=; b=SxJRXosjzOgOMkx5R6jPH6i3oHpvMB3oxTGWEiOf5x1MiSFzmJRYMrc5rcZIG+s7Al 4J99cRQx/JCAHKwq3V6Q3KSOndnrCNZlWV3tG33JSwpGnbIwRLub2us0ThI8yq+6arcZ juZl2KIOvPraXrr0TE925xfRvjjNo+2YPSjbUdBrXM53oEAgpJYbLquWajxkPvSASHNx qT3ASnNWGeORoWKV5upd0mdoP9v8NBtUdaCN7hqzvgxMk7/CGwKDUHORk82J4LxF/ZhH hcUgUU40m8a2+3IFTTPlRr0mKf9Bi6whxiR286b1qTELW0yHYL4iJSmgbEXjqQE73Sxc ZGxQ== X-Gm-Message-State: APt69E3P1mKF/vsqPBDRO/OUMVavTcW91n9eAFElSX5xrqbgeGo5wH75 Dcz0QCaB0HDqaAck0ij+epdAmw== X-Received: by 2002:adf:f5c3:: with SMTP id k3-v6mr16524343wrp.219.1530612894757; Tue, 03 Jul 2018 03:14:54 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id s12-v6sm956382wrr.43.2018.07.03.03.14.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jul 2018 03:14:51 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 57BBF3E0775; Tue, 3 Jul 2018 11:14:45 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 3 Jul 2018 11:14:34 +0100 Message-Id: <20180703101444.23778-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703101444.23778-1-alex.bennee@linaro.org> References: <20180703101444.23778-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:c0c::235 Subject: [Qemu-devel] [PULL 10/20] linux-user: add gcov support to preexit_cleanup 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: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , Riku Voipio , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net, Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" As we don't always take the normal exit path when running a guest we can skip the normal exit destructors where gcov normally dumps it's info. The GCC manual suggests long running programs use __gcov_dump() to flush out the coverage state periodically so we use that here. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé -- 2.17.1 diff --git a/linux-user/exit.c b/linux-user/exit.c index aed8713fae..14e94e28fa 100644 --- a/linux-user/exit.c +++ b/linux-user/exit.c @@ -19,10 +19,17 @@ #include "qemu/osdep.h" #include "qemu.h" +#ifdef CONFIG_GCOV +extern void __gcov_dump(void); +#endif + void preexit_cleanup(CPUArchState *env, int code) { #ifdef TARGET_GPROF _mcleanup(); +#endif +#ifdef CONFIG_GCOV + __gcov_dump(); #endif gdb_exit(env, code); } From patchwork Tue Jul 3 10:14: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: 140949 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp988140ljj; Tue, 3 Jul 2018 03:30:39 -0700 (PDT) X-Google-Smtp-Source: AAOMgpc8OAaTpu9iacgLJd+Qdj/MQFprAe029Imzw9t8iWE7fnWh0WijtIRi629tg7J4B6kxT7q6 X-Received: by 2002:a37:7141:: with SMTP id m62-v6mr24728556qkc.110.1530613839331; Tue, 03 Jul 2018 03:30:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530613839; cv=none; d=google.com; s=arc-20160816; b=NpJUb35D/19keeUW1TW5N0BKGj8fqxUT0C1juN39UVsdFhXB53RkD0EyqwVBVow2AZ lklGf9d5La09SOF51pWln/pe79623XutiEZXBP4FnxhRHy7CzkPsnYTRwJk7lHAH614U 7emeuC2/hYAV7Jts/YFFT/LZuWBdQiVdsjStk7k4jbEV2kPwQIcaOBlyCDmwY3bnV/UT 5Boty6+TZ3na1HFWv4Yd1pbhs5pL9k1o/GzBd+mXJqxV5TQpsvjhZD2a+0OzU/Cc/zZh bABdBH9hrkXxOjZ1ctxBalVbC3PjIk0pv43Z7c8/gZYHpPsUmg94XGHkhQY+g7EtL4Zo WPMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=IIxA5T5BGH3jy50BU07HFooNkyxX3SccLp9XKgAyF8A=; b=SrfyVXD/CeCmnMCI6DAENOyWOBOhgpaFJVnPvVz0M+BQYJo1u1sOEf6VUkFH7djSni MKjyPe9u7EEcLNOgSguMYTq4peoTb6TBquoS3EGNjWyRwZbq6aFpZKCjZQJfqpwp4Djk XFOoG+i6tqJtMjnTD08pBpQ7eVh5Yq04w6XR1DIjjLEGB8TBP546Uz5RuSd8At+N4Uek l25rWmrEtK1+NIjZkvDPjwrutP5e464/bliS08DWMFL1O0PtJJhjqIX53VERxtaYWx5+ dXY6SJjHK2Cv2ffmmuHmne+DizHGyI6oXAtbm6ai9bRzJ7eCVWaPf1dv3Zz3xrUi7FP5 2vrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=IfODDjzA; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id m32-v6si731599qvg.182.2018.07.03.03.30.39 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 03:30:39 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=IfODDjzA; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39437 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIZy-0002Yj-LJ for patch@linaro.org; Tue, 03 Jul 2018 06:30:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44885) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faISs-0004dV-A8 for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faISr-0004Zj-5y for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:18 -0400 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]:39467) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1faISq-0004ZH-VV for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:17 -0400 Received: by mail-wm0-x233.google.com with SMTP id p11-v6so1661998wmc.4 for ; Tue, 03 Jul 2018 03:23: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=IIxA5T5BGH3jy50BU07HFooNkyxX3SccLp9XKgAyF8A=; b=IfODDjzA652SHaUTqtKlYmrJ0DAY50aDgShrwlLk6+MqWzIrIaHqW/j0F70WAive4I 8I++YSylwLp/rEWSAOC2FHQRXo1lOwKNFArc1qdnbB2yPGi8D3izTULRYRzMSoyn3FnD EY6Y+fJbH6C0XtwjlpqedYeiWr+1DMX19q+kQ= 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=IIxA5T5BGH3jy50BU07HFooNkyxX3SccLp9XKgAyF8A=; b=FN7tSeOReaRnb/fXErfUteRvZcgK6CYj8D6U2eu7HcGYSWHd7MamwYUVUTqxm8ggHD VJc93Fgo9WGDNQKMvOkBZbo/AeWz3BGN0Hp15jANPvS+RC10RuUSMvRFxRbPQlMimdjI rgdZK2IS/IRga5WQWu/ftSlkOukhX24fqotRAAwlftXLknhqRaUW/7sQWSL5Yy5Rezmh 2pc5Cv1VDTB1LcOv54zhESjQjQHuWVo+XJD9Sxls+TPy1qdXcRvJ/My4JITBD4+YhA2v MVc1TM/kJC/mBzCAeTGeYwFfd9X5dyE1knIql3okUr53+4CS7aYaxxySrr9k/IwIVJiy nRoA== X-Gm-Message-State: APt69E0EQtTgKOjwPiZ2iU5thhQbneYllO0DVzsm+mgG3VZNmilrMcD3 18UB7FPHHv1jLvYjgid5NGMFTg== X-Received: by 2002:a1c:850c:: with SMTP id h12-v6mr10112913wmd.116.1530613395872; Tue, 03 Jul 2018 03:23:15 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r140-v6sm1424647wmd.27.2018.07.03.03.23.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jul 2018 03:23:13 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 6AF3B3E07B9; Tue, 3 Jul 2018 11:14:45 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 3 Jul 2018 11:14:35 +0100 Message-Id: <20180703101444.23778-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703101444.23778-1-alex.bennee@linaro.org> References: <20180703101444.23778-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::233 Subject: [Qemu-devel] [PULL 11/20] docker: filter out linux-user builds for mingw 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: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, Paolo Bonzini , famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The recent change from TARGET_DIRS to TARGET_LIST (208ecb3e1) had the effect of defaulting all docker builds to the current configured set of targets. This is actually reasonable behaviour but does run into problems if you have linux-user builds configured and you want to test the windows cross builds. This commit fixes that by adding a DOCKER_FILTER_TARGETS variable which is special-cased for mingw builds so we don't pass the whole set down. Signed-off-by: Alex Bennée Cc: Paolo Bonzini -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 91d9665517..1813ec0781 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -20,6 +20,9 @@ DOCKER_SCRIPT=$(SRC_PATH)/tests/docker/docker.py TESTS ?= % IMAGES ?= % +# This is used to filter targets from some docker builds +DOCKER_FILTER_TARGETS ?= + CUR_TIME := $(shell date +%Y-%m-%d-%H.%M.%S.$$$$) DOCKER_SRC_COPY := $(BUILD_DIR)/docker-src.$(CUR_TIME) @@ -108,6 +111,12 @@ $(foreach i,$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES), \ ) \ ) +# Special cases +# mingw/windows builds cannot build linux-user +docker-%-win32-cross: DOCKER_FILTER_TARGETS = %-linux-user +docker-%-win64-cross: DOCKER_FILTER_TARGETS = %-linux-user +docker-test-mingw@%: DOCKER_FILTER_TARGETS = %-linux-user + docker: @echo 'Build QEMU and run tests inside Docker containers' @echo @@ -174,7 +183,7 @@ docker-run: docker-qemu-src $(if $V,,--rm) \ $(if $(DEBUG),-ti,) \ $(if $(NETWORK),$(if $(subst $(NETWORK),,1),--net=$(NETWORK)),--net=none) \ - -e TARGET_LIST=$(subst $(SPACE),$(COMMA),$(TARGET_LIST)) \ + -e TARGET_LIST=$(subst $(SPACE),$(COMMA),$(filter-out $(DOCKER_FILTER_TARGETS),$(TARGET_LIST))) \ -e EXTRA_CONFIGURE_OPTS="$(EXTRA_CONFIGURE_OPTS)" \ -e V=$V -e J=$J -e DEBUG=$(DEBUG) \ -e SHOW_ENV=$(SHOW_ENV) \ @@ -195,7 +204,8 @@ docker-run: docker-qemu-src docker-run-%: CMD = $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)@\(.*\)/\1/') docker-run-%: IMAGE = $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)@\(.*\)/\2/') docker-run-%: - @$(MAKE) docker-run TEST=$(CMD) IMAGE=qemu:$(IMAGE) + @$(MAKE) docker-run TEST=$(CMD) IMAGE=qemu:$(IMAGE) DOCKER_FILTER_TARGETS=$(DOCKER_FILTER_TARGETS) + docker-clean: $(call quiet-command, $(DOCKER_SCRIPT) clean) From patchwork Tue Jul 3 10:14: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: 140943 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp984704ljj; Tue, 3 Jul 2018 03:26:26 -0700 (PDT) X-Google-Smtp-Source: AAOMgpetOWUAzaaBTp6pgpSLyhspqCv0W+6IuEl4UqFpUnLp5RPsMWN+k99o5zj/lXS2xDFssR6e X-Received: by 2002:aed:237a:: with SMTP id i55-v6mr14954956qtc.263.1530613586004; Tue, 03 Jul 2018 03:26:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530613586; cv=none; d=google.com; s=arc-20160816; b=ZERLhSrFUoQUuzKtEjUBKMl1yEvbaQesmp7lo3EWDsNLYteubVSsCW+CtIXzo7n7BH D9r+V8+RCRZU9DfDQYf0HOefqMVHA/+8ZxKhsjrNqWEur+ym1VEaUdlu5v7Adg/6+7A8 KF8BJhzxJ+G3l5rdEKUauHyqbuR6d4W+C+dEEPtTOMkr5FnHuyiUb0+PCGIcigs9TMbh A28sfaPI8l6ZfaoeKWtiJdSCYNiefircbcy4ROpVZGjnuT4IUIh3QVCdbnytxS0ySU+f RK7ZTBQPkujecZMlF8yBPd16LuBwaEkTOnEzfP7j4K00uu5pgPHq7050tJvdlttzlGDr slBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=67PRJX64n01zQtdiLOJbiBT3rliQYwWOfXFA2tr7xWQ=; b=Mth2v02dqiJfwwLbUoSitloumvNMx/uKlz42SoNLrFHvHpoT5RsP268Bh/a+olUlr8 F2UoGrUeFEagod0XxmBMHc31haasZVwTKhqoBh+cHcykO6fDpMccP7ZOcE4Z/tC6qCMO 7Xr/MKi2QoRh09OnUvSfRsKSw0eXwFopyXoGOtxCLkWB5MnrcA6/JJZDT84MX5TX97i4 IMjZb73q2oF/bQb5oaBRUqRf6I/CFgepE6ccgGPJGwed8CjfFqJHTpMhO3RVZg2/1n7U 1/0xK90ZjOCnFxZPKW9MSnIb24ReVLTfEjlEbICtfZYq6vjqsfP36VAsNnEzcWkqO4/B m4WQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Btehlq2f; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id e7-v6si645133qth.344.2018.07.03.03.26.25 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 03:26:25 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Btehlq2f; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39404 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIVt-0006De-Cj for patch@linaro.org; Tue, 03 Jul 2018 06:26:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43525) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIKp-0006r8-7T for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:15:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faIKn-0008Tu-Sa for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:59 -0400 Received: from mail-wr0-x232.google.com ([2a00:1450:400c:c0c::232]:40653) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1faIKn-0008TT-Ks for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:57 -0400 Received: by mail-wr0-x232.google.com with SMTP id t6-v6so1362097wrn.7 for ; Tue, 03 Jul 2018 03:14:57 -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=67PRJX64n01zQtdiLOJbiBT3rliQYwWOfXFA2tr7xWQ=; b=Btehlq2foN6byLPQeV6U4j8k/RAwlXwnD7uKvfLfO9J+P+ZrIHvUDo0hfoPSWvZMiT Ds+pioX37vwzGg+P9nAdvNlsJ3uLttu/PMo5yAH/Xk1dmJP8G6jtaP2hosIVm96e7oYA tR0azTZsw5R55d6WAj5EBPOc9bHAekFqRR1EE= 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=67PRJX64n01zQtdiLOJbiBT3rliQYwWOfXFA2tr7xWQ=; b=iSuMN0JsIJlVpyfOK/W1fy+687+EEDHEeIFQFKROmJ73RaWn/zWgUJHxg7eQBT8e8d Lmdxf4mpIUwptkn8eZYgFJ/LoFu7rkkth8tj0Qd7MUJIWoE5Nu9VnjTdQ9/+jmoZd6tx pD+8gbrdSviq0LhOKoZbg4e6e8suPnTIxAxh1F15dWehSpO33j+82LmVzu6P0/YLljjD u13bEpgcrggYyA8drBYQLWUTKdxzjh7aj4rw1TXr3A5aaKIRz0vwjl824nqiCjGhfBba LtWAIRmB9v/cQSnFK+D73t0ySSsDEpw5Bi0VMVtkvW+yIVhgugtTCIPW7TojRyf9lmht FZgw== X-Gm-Message-State: APt69E0gmy6k1T8fZG0LmoLVC+7QhmCP4pBwkYG3qfuOhotAT8wxngNp 04V9JC0u8YWN7O4/sq64beZt8If1snM= X-Received: by 2002:adf:c891:: with SMTP id k17-v6mr11331721wrh.6.1530612896631; Tue, 03 Jul 2018 03:14:56 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b15-v6sm952600wrs.96.2018.07.03.03.14.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jul 2018 03:14:51 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 7E9943E07D1; Tue, 3 Jul 2018 11:14:45 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 3 Jul 2018 11:14:36 +0100 Message-Id: <20180703101444.23778-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703101444.23778-1-alex.bennee@linaro.org> References: <20180703101444.23778-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:c0c::232 Subject: [Qemu-devel] [PULL 12/20] docker: ubuntu: Update the package list before installing new ones 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: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Since docker caches the different layers, updating the package list does not invalidate the previous "apt-get update" layer, and it is likely "apt-get install" hits an outdated repository. See https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#apt-get This fixes: $ make docker-image-ubuntu V=1 ./tests/docker/docker.py build qemu:ubuntu tests/docker/dockerfiles/ubuntu.docker --add-current-user Sending build context to Docker daemon 3.072kB [...] E: Failed to fetch http://archive.ubuntu.com/ubuntu/pool/main/m/mesa/libgles2-mesa_17.0.7-0ubuntu0.16.04.2_amd64.deb 404 Not Found E: Failed to fetch http://archive.ubuntu.com/ubuntu/pool/main/m/mesa/libgles2-mesa-dev_17.0.7-0ubuntu0.16.04.2_amd64.deb 404 Not Found E: Unable to fetch some archives, maybe run apt-get update or try with --fix-missing? The command '/bin/sh -c apt-get -y install $PACKAGES' returned a non-zero code: 100 tests/docker/Makefile.include:40: recipe for target 'docker-image-ubuntu' failed make: *** [docker-image-ubuntu] Error 1 Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée -- 2.17.1 diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker index dabbf2a8a4..c03520ce3f 100644 --- a/tests/docker/dockerfiles/ubuntu.docker +++ b/tests/docker/dockerfiles/ubuntu.docker @@ -1,7 +1,6 @@ FROM ubuntu:16.04 RUN echo "deb http://archive.ubuntu.com/ubuntu/ trusty universe multiverse" >> \ /etc/apt/sources.list -RUN apt-get update ENV PACKAGES flex bison \ libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev libncursesw5-dev \ libseccomp-dev libgnutls-dev libssh2-1-dev libspice-server-dev \ @@ -13,6 +12,7 @@ ENV PACKAGES flex bison \ libjemalloc-dev libcacard-dev libusbredirhost-dev libnfs-dev libcap-dev libattr1-dev \ texinfo \ gettext git make ccache python-yaml gcc clang sparse -RUN apt-get -y install $PACKAGES +RUN apt-get update && \ + apt-get -y install $PACKAGES RUN dpkg -l $PACKAGES | sort > /packages.txt ENV FEATURES clang pyyaml From patchwork Tue Jul 3 10:14: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: 140948 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp987614ljj; Tue, 3 Jul 2018 03:30:06 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeF2dbLy0vByKCdwmfcflfNJyPgUgVYiur8cWbXIflD1D0NxRn4JXi49ERShIE/Ow8KFqqf X-Received: by 2002:a0c:98d1:: with SMTP id g17-v6mr25663033qvd.27.1530613806744; Tue, 03 Jul 2018 03:30:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530613806; cv=none; d=google.com; s=arc-20160816; b=j5JBRxpiQJmwrFaBDu5Vjc3MG+7rZwqRvSLYjiHyXHsxqEZxOk2Z0l3rIfWqePrHzC zjhVe4Mi405ecdQyLERuDJo8M5nrUpp3nMUwd6F1xFgD4C+et3au7Wh0NKHoH758VVUn HcmU1SVPbPtnstOGTpjGUfXP265YzRuaX9b5ziGY7ObSizG7rAm4YHMFRNmUWH8xOSxk pStjU2G3/xgcBEULnTb/yCkxQ14ZON9EeQAJbnJ2TUIKkhb8uQrpu59uXle4xXfye16e Nw3kTbK80POMmNE/ONZHo5eSCOm3kHYQ1zbJUsCbCdjqJTqLn5US7k0GA107Z4Kv4AuI n+2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=tqitWrrthW3ePRqHSPq6AEIbvarXAfqV0MP+oDmH50g=; b=Chzfva9DewcAJoI5TCs/v/RfCf92HcKDA+70jpYA/fIRRAIVo/p0WZuk7JDUOis++K piVxtAPgB7a5eSno6zJX+raWLOyr0v5hAj7oRd6506ozQYYhIyjg0aLU0lu12EhR6gjK gJw8YGoBPc6mm+thE2QEsyCUzxwKGKbO1G/n/OMC5Ti7xGRNca3cyY8vyKNKtKwy4/Qt 8FISNHj5MKwNVoQ0+SkK40x1hfyGhkDQvnVhQK2F93LF3Gtb+2PsDfA70i8f+KrW0471 0ntk1KxC20dEvMVm6E4siX51kTkiy7Pk86syXJHeIOyg6+yDlo77mtgMI0WsqessEQ16 6koQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fUHWx7BI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id z39-v6si749321qta.380.2018.07.03.03.30.06 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 03:30:06 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fUHWx7BI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39427 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIZS-00017R-6k for patch@linaro.org; Tue, 03 Jul 2018 06:30:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44866) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faISr-0004bk-CF for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faISq-0004ZN-ET for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:17 -0400 Received: from mail-wr0-x232.google.com ([2a00:1450:400c:c0c::232]:44656) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1faISq-0004Z4-7b for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:16 -0400 Received: by mail-wr0-x232.google.com with SMTP id p12-v6so1381304wrn.11 for ; Tue, 03 Jul 2018 03:23: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=tqitWrrthW3ePRqHSPq6AEIbvarXAfqV0MP+oDmH50g=; b=fUHWx7BI3YH+HlIvDL0HNk9ssEuDqjqD2qg0ETi+PzWXva4ycIxd/SVY7fNoaXsGun XGkyfDqrPEc6/YhGIfFpdbcKmh7KDxBlMk8bNWwD1kB8GIVbLvrNqviCjF/IJ9tVYXen a/j4Cjmdhwb4AkwopHZ3Lb+joiCmDo3TKdvrU= 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=tqitWrrthW3ePRqHSPq6AEIbvarXAfqV0MP+oDmH50g=; b=Ymj6GlPKHhWxxlJo9N+CX8nzA/1VMSX6Yw0LbW06xFPt4l20E6rxC2CmUre3uc+RmA mNmYJQLPQuYqQr/MxFQ8jisq7FdGuED8HyciZLZkojocdwUTMpufCBf1V8cPhu85VBdQ ENXFuxTSrN3LZY7It3t4IbjDQOX7F4FrKQz5vR4yCY75EMUL0Ur82WiavwaIRdh4CizM fZdHP415axZLBeICa0wfpJ2h1S+Gmpid9aUBhBflGm4a0hA1BYw4jdcQTVVLJjKO1l6B cPRP1sBZq1+cNiPyqbisRI19seM3Z1YA439He5bfR993YZQy5wVV+FeBZN1orN+hzvej fHIg== X-Gm-Message-State: APt69E0Q0SVhNFBoReQCRu0yoHpISp6t6T0EDfWySUw9Zd9RQBGM+SzR PT8IB8MiRMMSLQXT4TNLuJZItg== X-Received: by 2002:adf:8796:: with SMTP id b22-v6mr22911298wrb.92.1530613395151; Tue, 03 Jul 2018 03:23:15 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id a184-v6sm1429071wmf.30.2018.07.03.03.23.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jul 2018 03:23:13 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 91BE83E0930; Tue, 3 Jul 2018 11:14:45 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 3 Jul 2018 11:14:37 +0100 Message-Id: <20180703101444.23778-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703101444.23778-1-alex.bennee@linaro.org> References: <20180703101444.23778-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:c0c::232 Subject: [Qemu-devel] [PULL 13/20] docker: ubuntu: Use SDL2 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: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Do not test the deprecated API versions (see cabd35840749d). Debian MXE MinGW cross images are already using SDL2. Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée -- 2.17.1 diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker index c03520ce3f..7d724e7f53 100644 --- a/tests/docker/dockerfiles/ubuntu.docker +++ b/tests/docker/dockerfiles/ubuntu.docker @@ -5,7 +5,7 @@ ENV PACKAGES flex bison \ libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev libncursesw5-dev \ libseccomp-dev libgnutls-dev libssh2-1-dev libspice-server-dev \ libspice-protocol-dev libnss3-dev libfdt-dev \ - libgtk-3-dev libvte-2.91-dev libsdl1.2-dev libpng12-dev libpixman-1-dev \ + libgtk-3-dev libvte-2.91-dev libsdl2-dev libpng12-dev libpixman-1-dev \ libvdeplug-dev liblzo2-dev libsnappy-dev libbz2-dev libxen-dev librdmacm-dev libibverbs-dev \ libsasl2-dev libjpeg-turbo8-dev xfslibs-dev libcap-ng-dev libbrlapi-dev libcurl4-gnutls-dev \ libbluetooth-dev librbd-dev libaio-dev glusterfs-common libnuma-dev libepoxy-dev libdrm-dev libgbm-dev \ @@ -15,4 +15,4 @@ ENV PACKAGES flex bison \ RUN apt-get update && \ apt-get -y install $PACKAGES RUN dpkg -l $PACKAGES | sort > /packages.txt -ENV FEATURES clang pyyaml +ENV FEATURES clang pyyaml sdl2 From patchwork Tue Jul 3 10:14: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: 140950 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp989447ljj; Tue, 3 Jul 2018 03:32:01 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe6yh9WXfnPsmcNMMLDvUD8S4Z2aYnyeITFUjEAHDj2NeKlh1rc8P30A0TpPKr/837YCT4r X-Received: by 2002:ac8:2384:: with SMTP id q4-v6mr26808503qtq.29.1530613921012; Tue, 03 Jul 2018 03:32:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530613921; cv=none; d=google.com; s=arc-20160816; b=LdqyYBGhLoGSc1PM4yXy286Zmyad6DR8tcVY1S7R138AJXxoeqADfmIGCqN5gydiXh 5e+6BRrgWYFIunjQrtnntMFj3vD9FxsBKtv5WneiWn5t7hQM9q2S4GVfWKfqOQ4lLmLU cBFgdq+6gOTzQBuGOO0D5YGWsl9fc9ak7TV5Xyk2NSzFOWQxw6Q3/0mEf7VN6+3+lcf+ LUOT0cnVS2vZyBaqVQnnw7oSIsWBcGS/xK17G+d2+kwI9iMdjIqfnsAEgKJ3zOlFKWli LeRAmtrvM+B2FWXJXKpBqu0HeZkZ7xxb9j9sCNLJNUVyje0bcN/TaqYRYozlEp9mXzdD m/Og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=Ay+M+0PhGOd4vF3x2EnXW5J1w/i4JFFPlcXOGETrRI0=; b=qZA9Jxeq/BIE0qDFK+g39K8x8CnlMHE4pUe4GDtVQkuFfZRU9NqLOD+483Nsu3cYhX Q+Oup2WSljpYz0gWnWImX/NXwFcb0v9Y2Sm6VMBI+dewyTKi003LYTC25eIpXtwhtja0 c2XCZP47APJhibzhTuUxxFXvS9IC6SHgNmVc5+hnwq7SgZXXpnw6BDhbmoABmvC+9KG8 32jTyYBiuxUrF0Hre3sbh6svJcabQaoQnoBGfp95Khg0pA79sC5O4h28hxIINOLLZ78U tZ+tYKAD7MmP01Ra+YTywgjNuGXDwmGTL+PBl+wkM00T3NXnIIUVIO6p2HtkEoPpniCw wzfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZtPyocmx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 101-v6si849670qkr.55.2018.07.03.03.32.00 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 03:32:01 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZtPyocmx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39439 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIbI-0002k4-Ez for patch@linaro.org; Tue, 03 Jul 2018 06:32:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44844) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faISp-0004a9-Qx for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faISp-0004Yi-0v for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:15 -0400 Received: from mail-wr0-x236.google.com ([2a00:1450:400c:c0c::236]:37844) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1faISo-0004YN-QK for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:14 -0400 Received: by mail-wr0-x236.google.com with SMTP id q10-v6so1383187wrd.4 for ; Tue, 03 Jul 2018 03:23: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=Ay+M+0PhGOd4vF3x2EnXW5J1w/i4JFFPlcXOGETrRI0=; b=ZtPyocmxtZ3O5e2sK07E+bgLznOHKq5wC5UOdSuJvWyF7sxf9ToKMQdzBXnda2pro0 kXtAhgEmEM9hS+7PWE2WIjaXgTXrtEO1ih6lz4u+zFnSnI8KjsNegLoCSxj2fKWxbEHE IcRSZ+xKLQN6EQrMUhAcvddUmB34gqkKvJ2Vo= 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=Ay+M+0PhGOd4vF3x2EnXW5J1w/i4JFFPlcXOGETrRI0=; b=Rw8zF/Fg90uYmeRgtG+2P4eQboQ8UilW7m85xk6216cvzEJs0nVvOlWoLFlgxVyPa6 Z/WhODMgyOsSeWzD25SI81B4luShwxHZxsXpL8n9T2aVLrmpYI6E9hatun6qVSBGaw+R mBf4nR8iTlIVLXuxw/EJE0jsa6o0rMwDWBkfjW6tjDF5jgURIuWrPOYxVnjh7eHzH1yw Qg54OuK2GGTihElGcm9bSQMeHrbygDOlm3UxruiWGD2TFSfpjThbNAqZMr1Myczm3g9v F4F253BrcKRy/d1kPPv1s2UwIpcbDJJR2J5GV5D5JRRhMk31HJDvbho2mc11Gsn930BE 8H8g== X-Gm-Message-State: APt69E2JxQ/xDvSk7VYIF6TeOjax5LOBLjuJDbLv0AzuJWlsh3Sb/bA6 +/XTss0vBjNIyjrG6GiYbmCNHA== X-Received: by 2002:a5d:4306:: with SMTP id h6-v6mr10041051wrq.58.1530613393797; Tue, 03 Jul 2018 03:23:13 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 143-v6sm1784485wml.37.2018.07.03.03.23.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jul 2018 03:23:09 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id A4A5E3E097F; Tue, 3 Jul 2018 11:14:45 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 3 Jul 2018 11:14:38 +0100 Message-Id: <20180703101444.23778-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703101444.23778-1-alex.bennee@linaro.org> References: <20180703101444.23778-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:c0c::236 Subject: [Qemu-devel] [PULL 14/20] docker: Clean the MXE base 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: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Using the duplicated same package is confusing. Reported-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée -- 2.17.1 diff --git a/tests/docker/dockerfiles/debian8-mxe.docker b/tests/docker/dockerfiles/debian8-mxe.docker index 9b8e577b03..2df4cc8c5c 100644 --- a/tests/docker/dockerfiles/debian8-mxe.docker +++ b/tests/docker/dockerfiles/debian8-mxe.docker @@ -14,6 +14,6 @@ RUN apt-get update RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt-get install -y --no-install-recommends \ libpython2.7-stdlib \ - $(apt-get -s install -y --no-install-recommends gw32.shared-mingw-w64 gw32.shared-mingw-w64 | egrep "^Inst mxe-x86-64-unknown-" | cut -d\ -f2) + $(apt-get -s install -y --no-install-recommends gw32.shared-mingw-w64 | egrep "^Inst mxe-x86-64-unknown-" | cut -d\ -f2) ENV PATH $PATH:/usr/lib/mxe/usr/bin/ From patchwork Tue Jul 3 10:14: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: 140946 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp986623ljj; Tue, 3 Jul 2018 03:28:56 -0700 (PDT) X-Google-Smtp-Source: AAOMgpf3T4N3KXWZptQVT8+7Jf/KB7/OrAXZElbOyELycOE7nt5GFuodsdjQJDXGdNOQXlvuq2B/ X-Received: by 2002:a37:9286:: with SMTP id u128-v6mr24137245qkd.29.1530613736549; Tue, 03 Jul 2018 03:28:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530613736; cv=none; d=google.com; s=arc-20160816; b=L3OPjj88LtGR2G9vnyNd+gZ6IIlzT4PRTRmemhvvhdMh5FOR4cyVIA0/dmEZ1hr1DK Y3L0kcSjDieppAiQirmgrYid11bw4OrMoauCMSDEVc7hVZe/EFL/462knbIZpcIsXPZ9 qXMdkzY85btluQvA3/F1nWmZXLwDgPw36Smkj7KPU3H27LvaUzcuEfxY0lXwYgOirgdj 3uTa/WMNAKNt0VJvO0dttD+YFE2hOug+Gwos+18zUiCxHvbLrlp2izT/gSReixWJ8xZz azNgQ71gb0PjX1Kx/aZ+3Feoe5IQrofvm2bzV77OnT6l06bRIuLf/KaZ5bbcx8w0tOwz UeSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=/vjdRXNILP8knJdwZtK+Uzxfa4zObr/2zkAtNixHZx8=; b=YwB809uEb5WE6iIkyjMCMj0yb+2fREikTTuxfK9grCvBT/iVu2wpip8uQrPEoU5MyP FfZtJQ/MZQg8mhnk0TWo8ETRmmoQ/yPCng0dUVQ4IR23hCPLAXjCaXFKsiCMIe5UBlQV VSVgH4IgDgcQnUshdGkQ7guWGxiQsl1ME4qkzb8BmD8ISCC0AZqOnRGHoOQVWKXpWlBa ol5fvy5BkxnXPok3aUds/wMcfTfa+lQsPkch+aCIqo4WzlcABtsJLy/yA2X4wOlR4JxN U6lf+zRQnIre8mCQn2oxPBRl4KQKsE46G4bL4qW2kkSYGHoGFCLmWrypXB4m4IK+MSZZ 2ESQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UNbwpdwx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id u1-v6si815394qvd.29.2018.07.03.03.28.56 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 03:28:56 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UNbwpdwx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39423 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIYJ-00009E-Vj for patch@linaro.org; Tue, 03 Jul 2018 06:28:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44823) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faISp-0004ZU-5G for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faISo-0004YJ-3W for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:15 -0400 Received: from mail-wr0-x236.google.com ([2a00:1450:400c:c0c::236]:38734) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1faISn-0004Xx-TV for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:14 -0400 Received: by mail-wr0-x236.google.com with SMTP id j33-v6so1389834wrj.5 for ; Tue, 03 Jul 2018 03:23:13 -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=/vjdRXNILP8knJdwZtK+Uzxfa4zObr/2zkAtNixHZx8=; b=UNbwpdwxryPwD95DuyPh2QjKRCN5nTwglmVzwKpab6Zw0uQqYPxsf/1H5JhFYoSktg WeKVm5mVBozmay0h6/wbEc8f6Fryvf7HdX9osZhDc0xedCb9xAIFk3m7pfw5ZsyDTUSc eVbfpul0cvIjLbDJqy2co52iV0GQ0KQMy0HXI= 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=/vjdRXNILP8knJdwZtK+Uzxfa4zObr/2zkAtNixHZx8=; b=GkXeE3YnywyDZNlLsvCK/RqbskKgW/9yYgqcLPBsBJmy5ymsUHI+J7nQgMv+wTAfq5 tbR1f1mykZ5jACj09UMxlek63+JPpen0W+D77ZJQ1a/NHYS503bAfLtFu6OlXOvTd2rV eVbeEc9x51LwPFQ7s8GDWpB48pCAR+l3hLF/atbUnJDB8PNV2pYHJ1PbyKM7Z7NHhcBg UZr+G5Y8ZR57Xd+JTI0HNgtfFXC+08kEocdArtEMQpWp0hctIXEO23/oZv9epwBgWXNG w0lGL0gqxs7QkX61GLabmBvYVZSkNAHEOCz/dHW4s4vZY85VJGM88w7lbxuO2CwWMe47 VdQg== X-Gm-Message-State: APt69E1hIiXgGAG4K/d8/looPMebGxn+EYrw+tsSoaExJjpXL0xT8l0i 3FrIyL3Od8/zUJvY9Kp0iDay1A== X-Received: by 2002:adf:f410:: with SMTP id g16-v6mr7000082wro.256.1530613392836; Tue, 03 Jul 2018 03:23:12 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 5-v6sm2647210wmv.48.2018.07.03.03.23.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jul 2018 03:23:09 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id B88FE3E0AC0; Tue, 3 Jul 2018 11:14:45 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 3 Jul 2018 11:14:39 +0100 Message-Id: <20180703101444.23778-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703101444.23778-1-alex.bennee@linaro.org> References: <20180703101444.23778-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:c0c::236 Subject: [Qemu-devel] [PULL 15/20] docker: Do not run tests in 'intermediate' 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: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé We can still build the DOCKER_INTERMEDIATE_IMAGES images, but they won't appear in 'make test*@$IMAGE'. Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 1813ec0781..8641f5da2c 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -5,6 +5,8 @@ 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_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 @@ -101,7 +103,7 @@ docker-image-travis: NOUSER=1 docker-image-tricore-cross: docker-image-debian9 # Expand all the pre-requistes for each docker image and test combination -$(foreach i,$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES), \ +$(foreach i,$(filter-out $(DOCKER_INTERMEDIATE_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 3 10:14: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: 140951 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp992359ljj; Tue, 3 Jul 2018 03:35:15 -0700 (PDT) X-Google-Smtp-Source: AAOMgpc5x/a3oyw6l2xUYb7zyOLFDXbkxJMr4S1leTtV7MT78RwIcX/yO/gouwquZWFWxoHYI878 X-Received: by 2002:ac8:222a:: with SMTP id o39-v6mr21446302qto.399.1530614115372; Tue, 03 Jul 2018 03:35:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530614115; cv=none; d=google.com; s=arc-20160816; b=UNijTRDfq3lPImu09jjegltAeE/zbI3hiQFBfnEXkYlCOOeYh3DSqEBtiLk4Q9RjCX h6DEo9xBsnhkpikFCRVAKUFqCscNMZLj4RHbP35RrD/oAOsYB6iZB8co0/YNDZKsUI2b KqlaVM7f/o4QbL5qLMuBnOuX6r+OlWVnB5qimaNTxk75A/bYvWChRrrhyvLSse6IZ9T6 yz0lM+YUjJGgYmW6p8rDBPXjxjkSTK+Oyfn6TB6ijNi4JQi7iY3LibexzySB1609aHDx bUnEg4PYKJuSTb/QHkwCUXf9mVHsnDJlHXwQnyC4GtUUfHCr7A5CQ6G6Aon+icUeWBfe 8JqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=cnMq6Gj3jdsnaP51e6jpC06jGmLFPaetfeL48VID9N8=; b=uknY0HVvM96aQaTGM6WOPKHoZErDEwJ1wCkQbjDMGxtLc16N/0nwQHtItJ1YV0E7Ja GPJx8pQV2/KDQjfHLY1UZFHXZMmb6SOy6c4OeBBzq+EA9P3KpEpJIL1xsoZoHcV+sr2a +Uveh+p3il7sptP81TKMuSL59Loklg07Ooq4gGdWnOBDaKJ456Hc5knYO92r69Hgp7Dt BiAJqFFlSkK5j/qM/Kygr0itZ4fsMC8umD5GyvgtKQWFVHFkEFBP9HWcGkIwOIfYu6/S LG8y+O1+r26/OhNGbeSfD78WwB0nWOpzzYwgZmJ1N89QlziFYbIE3LoKhEwCL5kEBBbA kaLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=EgVY8KDD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 15-v6si794048qtp.95.2018.07.03.03.35.15 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 03:35:15 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=EgVY8KDD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39478 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIeQ-0005XV-UP for patch@linaro.org; Tue, 03 Jul 2018 06:35:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44925) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faISy-0004jh-5I for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faISs-0004aN-Dp for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:24 -0400 Received: from mail-wm0-x22a.google.com ([2a00:1450:400c:c09::22a]:33772) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1faISs-0004a9-5t for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:18 -0400 Received: by mail-wm0-x22a.google.com with SMTP id z6-v6so10061847wma.0 for ; Tue, 03 Jul 2018 03:23:18 -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=cnMq6Gj3jdsnaP51e6jpC06jGmLFPaetfeL48VID9N8=; b=EgVY8KDDCi/a+wp6DDWbNrM9MUPzmUcjOIhhViK8mZxyV1TwXyobpmv2EJET9Ie6Gq 24cFj5aEBwdLSSWB2RPNaVlmDmfy3eDHQkIv7BoyxI9cIjqt9IA5jYpRJNrt8zFLIo3q 7znsS4vkToBUuUUAfURb+rEPOcS6+9Ccwjh/o= 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=cnMq6Gj3jdsnaP51e6jpC06jGmLFPaetfeL48VID9N8=; b=t1FYm3m14J5TmxZkmfUpIB4FIpNhH1pForpO5x4ciSkTmhOgst80zSbpyTYO4bQgf/ zWYkPgkmq05bk8yxXGgckzPalRJkeWcdD8uX5bcSrWheGOm7+SJyQbQtKVDyT/5DW8Iy e+EBcOfR9QmRhO0gvR7/C2MItUqhIBgL+6+E4HHQHXYx3DXrtnKOu36zyJaxvQKiTmf+ hmhahYKXipRjGEIcNMW7MfN2XK5ADtlkveGSWmyQSnN7qMLyBrYkQroXPpDXhAce8w3M GPw0+Ze6S7QhMPzfXOtYUYZA1pxI4x6PAgBEKnKljNzCXKyyExg0dXOAUrDy/zn7Ul35 bJxQ== X-Gm-Message-State: APt69E3XXBhOEX8tChUHDMFlkTqpcJRprPbWcgTgBA3kEhtslxbDnw/w n9OKpjc23YsBsUC81MBwcatLaQ== X-Received: by 2002:a1c:b004:: with SMTP id z4-v6mr10918699wme.70.1530613397055; Tue, 03 Jul 2018 03:23:17 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 39-v6sm1741084wrv.79.2018.07.03.03.23.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jul 2018 03:23:14 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id CB3BC3E0B3C; Tue, 3 Jul 2018 11:14:45 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 3 Jul 2018 11:14:40 +0100 Message-Id: <20180703101444.23778-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703101444.23778-1-alex.bennee@linaro.org> References: <20180703101444.23778-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::22a Subject: [Qemu-devel] [PULL 16/20] docker: drop QEMU build-dep from bootstrap 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: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is best done with any child images that actually need it. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.17.1 diff --git a/tests/docker/dockerfiles/debian-bootstrap.docker b/tests/docker/dockerfiles/debian-bootstrap.docker index 3a9125e497..14212b9cf4 100644 --- a/tests/docker/dockerfiles/debian-bootstrap.docker +++ b/tests/docker/dockerfiles/debian-bootstrap.docker @@ -17,5 +17,3 @@ RUN /debootstrap/debootstrap --second-stage # At this point we can install additional packages if we want # Duplicate deb line as deb-src RUN cat /etc/apt/sources.list | sed "s/deb/deb-src/" >> /etc/apt/sources.list -RUN apt-get update -RUN apt-get -y build-dep qemu From patchwork Tue Jul 3 10:14: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: 140941 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp982621ljj; Tue, 3 Jul 2018 03:23:59 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdDRXoFn78EcgIsh/7Sxp/QXZhBD0wA4Q2Qv6qN9ASCntLHM6jnypauck15Xoxt1k+4gfqn X-Received: by 2002:aed:3b08:: with SMTP id p8-v6mr27062644qte.103.1530613439354; Tue, 03 Jul 2018 03:23:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530613439; cv=none; d=google.com; s=arc-20160816; b=sWvaD1tWCknauuKpBq0in07st/16L0rKejalise7xDFrgQNDxV4AUFS36NZHZUd3vl a0lodIU9l8jJQfVAY+S4x5kJmSewxmTV1i92wZ7GczIUxslSLCqmWL4UYVpE6ubUJvbc KiA3nN9sbuTVUY/uI4NLvPDiTUQCgWrkFAIf13XUA3WcB1zpuCp5q4/W3RrbbApovpdW gamsHp5km+zr1YlQjxpUfaifpz9DWbAEP/XEnYZ2s5KRPZIfBhsBqOzjokEFcfKfBKyr bDVga17ZJg53L+tDE7Qoxb4wfRgJan7EPsqYQk96xPnEKjVmY/U1EZQjTezUaooRF5sU LT4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=7JwlLzZv1CYp13jC2STPkaY0Vw0VaJx1WLbx+yFrznU=; b=d5fh0HYbBLhnTQ0XI77AOwcq9LFsi8r+Xt2dvMzouDK5KYKw9IBS7JhEz4c0VzSSGh N23YN6/JWIZMe1+zMKMQewRAji98P/UJ0G4lLMVaHHz+gM5gKskw22XB/vkvhhwEG9sO GLyNIZebD3PyXx09K5EXEMxlXNp07KAhyWXekbjHlnlj91JwRJlVAKxv7ndPwcXSCNmB EquhtyS0ZjeGDehkoRydorsx1Mlou+Iiv8y/rHj9cLXvfrHrXUTML1ggm7pzIBwJbf0t E0e0dF2c5D3JLRA9G8ZWyzPpgDi7h0AhqzibsBpVzfcqnlPFvqOOZJvfGSj0bnWeHXac VjQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=AVItRWto; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id e6-v6si701381qvj.61.2018.07.03.03.23.59 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 03:23:59 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=AVItRWto; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39400 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faITW-0004s8-PL for patch@linaro.org; Tue, 03 Jul 2018 06:23:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43549) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIKq-0006ry-4J for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:15:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faIKo-0008Ug-VV for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:15:00 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:52681) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1faIKo-0008UC-Q2 for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:14:58 -0400 Received: by mail-wm0-x244.google.com with SMTP id w16-v6so1696814wmc.2 for ; Tue, 03 Jul 2018 03:14:58 -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=7JwlLzZv1CYp13jC2STPkaY0Vw0VaJx1WLbx+yFrznU=; b=AVItRWtoVMejOxkPiLWYzVdtQQ0OjbpQpI5en+KutecULt0CDAbftT7n+QxswVtbqe uim3Omc9NUlcCvCPB4mjmNOKeuorinOmbdJzzC1Ot/rsySdL1TIKcra0PmucAyelbwt4 4a7Cu6bSJecY1pdjf6ktn8o3o0TgfI+pBv8eU= 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=7JwlLzZv1CYp13jC2STPkaY0Vw0VaJx1WLbx+yFrznU=; b=q1axzAlHPbsX4leuXTYdkrrdV8BMIaEGQBpwh0SMPkTy6I8guWSE1XDi8gM2QEnlKy abiCGlc0jvwhaJoinitDFEW9z4CgQ+h+LpYnA4omOHLwoDCeNoWj0GS54Dci2An9JkqZ fbdDGR2rTqe8xMIrFfI7Cn5RZBfHs4cz71ElEn6LEUZ5auLuoncZ3MrSGCNgRW8rSuuZ V15075L3iWYDcVZpJA0zwQg+p7A4iY695lDfk1yuJSX+T+EFRlJ9KE3Nxqijg2a5Ifoh XjVtHczRXiGTdx/iyckwab9gyEpmE4BU4U78PJL2rYrepg50hIlm7eCzN4pxfVFlXb+J yDlA== X-Gm-Message-State: APt69E1CFIT1pHmZU48dHsfEQRXZ4e/tFgpGbvFmvD2mTsHGCPieNhLQ KooKkI+9bPiIoMcL/MJ76Kihkg== X-Received: by 2002:a7b:c01a:: with SMTP id c26-v6mr10724505wmb.33.1530612897576; Tue, 03 Jul 2018 03:14:57 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id p124-v6sm1524323wmb.28.2018.07.03.03.14.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jul 2018 03:14:51 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id DEE753E0178; Tue, 3 Jul 2018 11:14:45 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 3 Jul 2018 11:14:41 +0100 Message-Id: <20180703101444.23778-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703101444.23778-1-alex.bennee@linaro.org> References: <20180703101444.23778-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/20] docker: debian-bootstrap.pre allow customising of variant/url 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: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We default to the buildd variant as most of our images are for building. However lets give the user the ability to specify "minbase" if they want to create a simple base image for experimentation. Allowing the tweaking of DEB_URL means we can also bootstrap other Debian based OS's. For example: make docker-binfmt-image-debian-ubuntu-bionic-arm64 \ DEB_ARCH=arm64 DEB_TYPE=bionic \ DEB_VARIANT=minbase DEB_URL=http://ports.ubuntu.com/ \ EXECUTABLE=./aarch64-linux-user/qemu-aarch64 Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.17.1 diff --git a/tests/docker/dockerfiles/debian-bootstrap.pre b/tests/docker/dockerfiles/debian-bootstrap.pre index 7c76dce663..56e1aa7a21 100755 --- a/tests/docker/dockerfiles/debian-bootstrap.pre +++ b/tests/docker/dockerfiles/debian-bootstrap.pre @@ -32,6 +32,15 @@ if [ -z "${DEB_TYPE}" ]; then fi +# The following allow finer grain control over the defaults +if [ -z "${DEB_VARIANT}" ]; then + DEB_VARIANT=buildd +fi + +if [ -z "${DEB_URL}" ]; then + DEB_URL="http://httpredir.debian.org/debian" +fi + # We check in order for # # - DEBOOTSTRAP_DIR pointing at a development checkout @@ -107,5 +116,5 @@ fi echo "Building a rootfs using ${FAKEROOT} and ${DEBOOTSTRAP} ${DEB_ARCH}/${DEB_TYPE}" -${FAKEROOT} ${DEBOOTSTRAP} --variant=buildd --foreign --arch=$DEB_ARCH $DEB_TYPE . http://httpredir.debian.org/debian || exit 1 +${FAKEROOT} ${DEBOOTSTRAP} --variant=$DEB_VARIANT --foreign --arch=$DEB_ARCH $DEB_TYPE . $DEB_URL || exit 1 exit 0 From patchwork Tue Jul 3 10:14:42 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: 140942 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp984457ljj; Tue, 3 Jul 2018 03:26:07 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdzSg7BWMkokOjTsLw8yw7vBvw/D/pneChipK+sKiCJukMyRFdTxrf51KNQunTfCbwhA8e5 X-Received: by 2002:a0c:c70d:: with SMTP id w13-v6mr25756444qvi.205.1530613567380; Tue, 03 Jul 2018 03:26:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530613567; cv=none; d=google.com; s=arc-20160816; b=Vr5pvmz+XAjgCfsS2h/X6ExO9EY9hLJ5h8HzSJTKWtLudOeRXdLW69lg7kpaCSr+2C KPYegcmGUb+9fIZJci0ZLGeZBemYQ50IV5vkUrWiYUvqlpw35q6IxZq6ap5DjYj9aaHL dooRBsOfx+KXKeHjoS0OWwfMuzsRhc7yA1+B+rr4AJ3IavquxKhY/EypMLMpmoiAb7lH FtrzThI5cIaNXwofMT4Z4991RjZWG0Yqwj1xnhOHpWPDeQvBTCvjKvAsa51HIGkds5sm eIO2up41JuUN1qAoSdb/18CIFqMrr3UG34yYh4rGf8hdEfXwsxwvozyMERGRD7iquMiV Uwyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=dfamiZwUizdFYQlELVkLTTmRfXIkEI4HX3JBKPunFPc=; b=UrgeMYtLTWBKOSBzqxZ58gKEQkVFGzR71oAd+u3RJaIIq8ouzDNzVtfE/QxRtKOlSC +m6mvdWZiHqQ+Xecr4OEHeLFj6yh3g/OAVFRRX41/mCEgThfFUtlz5JEmqiOxTOGYBiv 8/FoH8Svj6UnxQCn4+hELM3DbYVO1nHIsi370N/jeJzGbKU3B71dmE7ID4dFFN48RNMQ jDtpkn00USbwlCRmLFM7Fkcp6FdW30kPcstTkCAL506Pbq5OiPSYvVHvFCWz0X/YrT65 EpW815oXVqIJbNywW4y3l5TrmQqd5HTyrNXiJ3k1b9k6HBpBsakQ7lIuZx3WJQRmKe3g 2ovA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Gm3tX2pZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id q97-v6si750518qkq.350.2018.07.03.03.26.07 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 03:26:07 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Gm3tX2pZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39401 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIVa-0005yP-Pf for patch@linaro.org; Tue, 03 Jul 2018 06:26:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44811) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faISo-0004Yx-KN for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faISl-0004XR-GZ for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:14 -0400 Received: from mail-wm0-x232.google.com ([2a00:1450:400c:c09::232]:54939) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1faISl-0004Wv-AL for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:11 -0400 Received: by mail-wm0-x232.google.com with SMTP id i139-v6so1717358wmf.4 for ; Tue, 03 Jul 2018 03:23:11 -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=dfamiZwUizdFYQlELVkLTTmRfXIkEI4HX3JBKPunFPc=; b=Gm3tX2pZLpQSQ6PLkuZVqPcZ90VGYQdp0oFOtB9YUVXsf+PfKkK2DSV0RPsTDWq7q0 mhnODAOg5Z4bl6LPowA5j5g4kn6cPCvauqyFHqKtI0td4vZ/K3WrbalPebkUms7Gvjvx AiPjtJTh3wGnrTq+mdm/EgSo6WBEqlrfHUhDY= 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=dfamiZwUizdFYQlELVkLTTmRfXIkEI4HX3JBKPunFPc=; b=RlMxRK1cWtexRHRFpnJ/0Elib+E3qM+AYxyzSHgVoNDPcjJHMLASpk8ke2WCxPNlaL I91BwuYdGLuOIdWdBZOgia+3t2Z0PZDGJhA97ANQxREwPDfY6UrAnCzAFXiWcLQzNHL0 sTEr/95lz2afLiPq5EE2IdrkqGkH6iOF/5I7IUG+4Y5trUPBYEYfeQ+eUdk6uwzT/4TJ VXmy9lRFk49x/3i5qB1FqsJDS2NWpYrOpL+3EqQFHuDsYkmFUksUnt36pA0lcoy30QB8 fqnQ4y72o9SfkxFEwW+7bzofd5fMru7t/dbdKMheNycrsS7QA+cTFdBJ8LGaLV3YTmiv WKDg== X-Gm-Message-State: APt69E0RNzeA3ZXVTXkfD9xPvBQAp6rMFKEO7iVtinPssKt2QbmvH5BI 1K+VMUEfT7kJEkpYEdUW0sbtQg== X-Received: by 2002:a1c:13ca:: with SMTP id 193-v6mr3948996wmt.127.1530613390261; Tue, 03 Jul 2018 03:23:10 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c128-v6sm1200387wma.17.2018.07.03.03.23.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jul 2018 03:23:09 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id F13873E0B46; Tue, 3 Jul 2018 11:14:45 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 3 Jul 2018 11:14:42 +0100 Message-Id: <20180703101444.23778-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703101444.23778-1-alex.bennee@linaro.org> References: <20180703101444.23778-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 18/20] docker: add special handling for FROM:debian-%-user targets 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: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" These will have been build with debootstrap so we need to check against the debian-bootstrap dockerfile. This does mean sticking to debian-FOO-user as the naming conventions for boot-strapped images. The actual cross image is built on top. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.17.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index b279836154..69e7130db7 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -113,6 +113,10 @@ def _copy_binary_with_libs(src, dest_dir): _copy_with_mkdir(l , dest_dir, so_path) def _read_qemu_dockerfile(img_name): + # special case for Debian linux-user images + if img_name.startswith("debian") and img_name.endswith("user"): + img_name = "debian-bootstrap" + df = os.path.join(os.path.dirname(__file__), "dockerfiles", img_name + ".docker") return open(df, "r").read() From patchwork Tue Jul 3 10:14:43 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: 140944 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp984934ljj; Tue, 3 Jul 2018 03:26:44 -0700 (PDT) X-Google-Smtp-Source: AAOMgpf5dIxRQ4cze14w1L09CIdJjSZX52wTYK3TGHXzr73gfns+P2GHBD3F+Yd2VazU2Q4eNRJ7 X-Received: by 2002:a37:a4d1:: with SMTP id n200-v6mr25315091qke.348.1530613604405; Tue, 03 Jul 2018 03:26:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530613604; cv=none; d=google.com; s=arc-20160816; b=cu03EaNYyP+9LS4YAQt3ZwAA6r4k4rh/zE1Spy6E07deX6N7W9V0CWscBsnQqks8jZ u9kdqfx/d3KxKBzBqUnGyMVwr6m0ViR3jRd36XsucvvwpAzNWDCLtctfbIWwplDnsQ+X SHhoR6q5ZpaCQ43eYuMEjNjtJQlp74l8aObbP0zpD82jjz8F0NbLDS7KgixK4VJG7vtm ox/vR8b0CQMiYtKvCbv12QAp08gfewCwkYeaMu1qEeNgU7PLpJFN/qs+xqBnIsMpQM8y 09O1oVIHF2HdLHZ+ERHLRktHB5KHlO7rtGHLOr/0y+UlrMxIHtWYSyyJmdIgWVJBlX0o LXrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=fs4oHxe4Fgnl2/Z3cr5EMe1Y/VBGTOockCco5utisi8=; b=cki8AIXLMlMBCs1OtIKSgEDAk4EvGjcw6OXYMdWIHTQECN8HBrXGyIC0sFb3+mELjR SWhsDygE14ouy1xXh3HQV5iC8iAnEXpHavXDZ4TMEEwsI3M8nPRs6wj5w0LV48xTTTZB lpOPJH4h5RyzqAahxDh4pYjAjjg8k/WyI/iXTLgnTVo4Iph8k0gKGlWj7kxRMta2zqSC k6FpHruxRm971yzuAa+K2uGCE1XHpDdaFDyKk/9GGQY8l+m8R6sHpBqkf9XLBN5nndx9 ssUT1vtTY+RpXg+wmaGToGYtMgF9Z0xIBIUXxSbcPErXbGl6UCyd8BCoB87GkTDbpMoJ ZQmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kf3Ezj1J; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id j125-v6si722245qkf.275.2018.07.03.03.26.44 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 03:26:44 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kf3Ezj1J; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39415 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIWB-0007XZ-Mp for patch@linaro.org; Tue, 03 Jul 2018 06:26:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44809) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faISo-0004Yv-Jj for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faISm-0004Xf-83 for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:14 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:51922) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1faISm-0004XL-1c for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:12 -0400 Received: by mail-wm0-x244.google.com with SMTP id s12-v6so1741026wmc.1 for ; Tue, 03 Jul 2018 03:23:11 -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=fs4oHxe4Fgnl2/Z3cr5EMe1Y/VBGTOockCco5utisi8=; b=kf3Ezj1Jm+BrpfUHdwpnoCriEL/C7Dk/DDekS9LJWOSD/KmMSBgUPMIsjDHWA/TYRB 5PhYpMWOmQAI+hzKUkvI/koOzD7WvphOmjnNKV8dOYttCezkuSxpiLN2PhhuPJfRMv+F KAXKrVUl3XgyFE/q6le6gY8WjTf7IZWplsfiM= 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=fs4oHxe4Fgnl2/Z3cr5EMe1Y/VBGTOockCco5utisi8=; b=GphJKnlDrxPNY4D9YVgce2nb7SQUelIOhhKuw/1zeJVVp8z8PwH4yj0AkqCS7+8iSa eeW0OMbMiR97qEhoqCEOin+xNNMW6UVTBswEOplqAsvlRPkvLHJmCnlYw3l0sEi5tXBW iAJw8gUizYznFj8SRhRpfpO8o0qaRvSVOH9mGPav8ybNTWFVMll9ac9okkXVfKRq+IN/ c99x7TbBavZQncyQ9fh97kn0intzM9PbbVKUmaaPllX3EqIhwZ+61ALl+UE3/we6hwUm PHjl+MiKKMFeDiLe7Ct1CEtG52iPblznFYbJvupGWIAplfDHP38xIpntzLJVFACUVpmT 6G/g== X-Gm-Message-State: APt69E3Tt7IYK9zhiY8ceJklR22R0lMvV7oAFtlKwpKwv5RW76hXThhS noEL34Z8ruFEzlpjtzQDBynwFw== X-Received: by 2002:a1c:e5cd:: with SMTP id c196-v6mr10515121wmh.101.1530613391005; Tue, 03 Jul 2018 03:23:11 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u13-v6sm1424630wri.72.2018.07.03.03.23.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jul 2018 03:23:09 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 0FB2A3E0B55; Tue, 3 Jul 2018 11:14:46 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 3 Jul 2018 11:14:43 +0100 Message-Id: <20180703101444.23778-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703101444.23778-1-alex.bennee@linaro.org> References: <20180703101444.23778-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 19/20] docker: add special rule for deboostrapped 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: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We might as well have a custom rule for this. For one thing the dependencies are different. As the primary dependency for docker-image-% could never be docker-image-debian-bootstrap we can drop that test in the main rule as well. Missing EXECUTABLE, DEB_ARCH and DEB_TYPE are treated as hard faults now. We also error out if the EXECUTABLE file isn't there. We should really do this with a dependency on any source rules but currently subdir-FOO-linux-user isn't enough on a clean build. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 8641f5da2c..d43af0db32 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -49,9 +49,6 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker "CHECK", "$*") else docker-image-%: $(DOCKER_FILES_DIR)/%.docker - @if test "$@" = docker-image-debian-bootstrap -a -z "$(EXECUTABLE)"; then \ - echo WARNING: EXECUTABLE is not set, debootstrap may fail. 2>&1 ; \ - fi $(call quiet-command,\ $(DOCKER_SCRIPT) build qemu:$* $< \ $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ @@ -59,6 +56,28 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))\ $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\ "BUILD","$*") + +# Special rule for debootstraped binfmt linux-user images +docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker + $(if $(EXECUTABLE),,\ + $(error EXECUTABLE not set, debootstrap of debian-$* would fail)) + @if ! test -f "$(EXECUTABLE)"; \ + $(error Please build $(EXECUTABLE) first) \ + fi + $(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)) + $(call quiet-command, \ + DEB_ARCH=$(DEB_ARCH) \ + DEB_TYPE=$(DEB_TYPE) \ + $(DOCKER_SCRIPT) build qemu:debian-$* $< \ + $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ + $(if $(NOUSER),,--add-current-user) \ + $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES)) \ + $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)), \ + "BUILD","binfmt debian-$* (debootstrapped)") + endif # Enforce dependencies for composite images From patchwork Tue Jul 3 10:14:44 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: 140947 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp987137ljj; Tue, 3 Jul 2018 03:29:32 -0700 (PDT) X-Google-Smtp-Source: AAOMgpd2Wk3XrVDzEjMNhc5ouBsbRCco5pg2r1B3izQXVkdyHgDtrfBNVUpAs81d2eiTtZhQ0Pa0 X-Received: by 2002:aed:3766:: with SMTP id i93-v6mr27419361qtb.277.1530613772190; Tue, 03 Jul 2018 03:29:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530613772; cv=none; d=google.com; s=arc-20160816; b=YIJ55EcKGp/I+P6KGCBqlfa8vAA4xJOh+rtF2rUPp+oJjAiXwB4wdlzTpTlnwCiAf9 zquBQ53YQehxpnhhfQ2wBWKFAQ/Pt8XxZIwTSN80Dczuw9PSpiz4nbvZOQyEtdqTpgHZ fEVWuWGqEzotR2n3wNt68tjH7ffrUw0eLRxcQrFDHfVEZBuUflQSDfEu9QbUIH2NJJZY 9o+aMI4ouqV3yP5vivCgv12Rupv3zK/z/FlamTSn0EnHl2kIR1JqJQHd3lZv/d6JDw+E JQi2cqCoECwq7e+fgHjlssuDUw45FDQOPUsFpD1yS+BEy5Y20L327BIEZVYDFVyUQQqs FP1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=1TZ8UFL28lYw7e8FtBRDZ3v7mzvmort2kp3kI1KhBj4=; b=be9VeStaRBfq6oam5Y9nLI5ZDHmsqPW8trE2Y+qwufKTa997g/gw6fxJS0n1FMscaB a8HxW4eCDJxWzOvJpwdIsOQBK8+e8wEoU02WnGnzEgEI39I4XEwVlrVeIdszcH9SJv8s wcZ9nBjPycVEwfMxPLfilAnQtATGcA7K2UxXBAac7/P1mXBZ9WwECx/vV0v1WUzwMsCO oO487GlO7rSRSoBN59ZlHrGDeQeXxWl8zZtCIZnavpMgTjOrStJ0E0WcAvAObv6YbNmx kNN2NHzFiuhsiU6bBxeTGvH3JT4mH5Yalz/pRj/esyFr9R1iz78NH+jMPMv/vG5ycVhS bi3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RlAUCNTW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 22-v6si751475qtx.31.2018.07.03.03.29.31 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 03:29:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RlAUCNTW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39431 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIYt-0001OP-HX for patch@linaro.org; Tue, 03 Jul 2018 06:29:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44815) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faISo-0004Z7-QS for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faISn-0004Xz-9p for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:14 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:53653) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1faISn-0004Xl-1X for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:13 -0400 Received: by mail-wm0-x241.google.com with SMTP id b188-v6so1732949wme.3 for ; Tue, 03 Jul 2018 03:23: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=1TZ8UFL28lYw7e8FtBRDZ3v7mzvmort2kp3kI1KhBj4=; b=RlAUCNTWvCvOHcxv2kPkpKhCPqHsma00qO8iC5ulN8R0G6c9Wkqbk/LNDTd0428rok x87nsVqgmw/ncOdkyZ7gXIGkJ+btiWvYKlevt9SYSGiEWaSD8W54XylegGBVu84pzrX0 7IJD6OGIQlF43whFyleREJTR8ebcsXEpMo4u8= 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=1TZ8UFL28lYw7e8FtBRDZ3v7mzvmort2kp3kI1KhBj4=; b=Y6PMQ6av6iqNGLcOxq0/vHSKc33ZdeVG6QkVMWEpygcDigDqk4kuvmyEHjRgyXLqjG GWLIsnGZUHxhuVpLylW9/ZV+P/IeHVPN/McfbOV6nW/foix+o8XZaNoY+ulXegmHKPOk nFzaHGchZyQLj2F/sOmQSfubzT1RDG6upp/RyPkBOHzdIisEfgnxCl8GWfuuSaNT7ird bWv//nnYT4q3k52R0U1fmQQL0flcPZFn849ezzQuZf6JYY8oJRjTwLVOFZHp28zTzEgJ P3vXYtlzPWeTxDsRzZrotXFWVpEaiYIbQSfAH8DCjGFbCu+OmworWOURDAUXCxhOsWXt qEkg== X-Gm-Message-State: APt69E3gamP0HHoguzyp7dWW9LQR0yiaOFFqebJARrJsCQgWR9KzPeIl O6ghNckxZzbGQQjdp3uGMYY0hqIGR+g= X-Received: by 2002:a1c:e8c:: with SMTP id 134-v6mr10792960wmo.51.1530613391913; Tue, 03 Jul 2018 03:23:11 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x15-v6sm1453932wme.24.2018.07.03.03.23.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jul 2018 03:23:09 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 244B53E0B6C; Tue, 3 Jul 2018 11:14:46 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 3 Jul 2018 11:14:44 +0100 Message-Id: <20180703101444.23778-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703101444.23778-1-alex.bennee@linaro.org> References: <20180703101444.23778-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] [PULL 20/20] docker: add linux-user powered cross builder for 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: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We can't use cross compilers in the current Debian stable and Debian sid is sketchy as hell. So for powerpc fall back to dog-fooding our own linux-user to do the build. As we can only build the base image with a suitably configured source tree we fall back to checking for its existence when we can't build it from scratch. However this does mean you don't have to keep a static powerpc-linux-user in your active configuration just to update the cross build image. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index d43af0db32..12852ebbc4 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -121,6 +121,32 @@ docker-image-travis: NOUSER=1 # Specialist build images, sometimes very limited tools docker-image-tricore-cross: docker-image-debian9 +# Rules for building linux-user powered images +# +# These are slower than using native cross compiler setups but can +# work around issues with poorly working multi-arch systems and broken +# packages. + +ifeq ($(filter ppc-linux-user,$(TARGET_LIST))$(CONFIG_STATIC),ppc-linux-usery) +# Jessie is the last supported release for powerpc, but multi-arch is +# 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: EXECUTABLE = ${BUILD_DIR}/ppc-linux-user/qemu-ppc +DOCKER_USER_IMAGES += debian-powerpc-user +else +docker-binfmt-image-debian-powerpc-user: + $(if,$(call quiet-command, \ + $(DOCKER_SCRIPT) check --quiet qemu:debian-powerpc-user \ + $(DOCKER_FILES_DIR)/debian-bootstrap.docker, \ + "CHECK", "debian-powerpc-user exists"),\ + $(error To build $@ you need a --static ppc-linux-user and configured binfmt_misc setup)) +endif + +# We build the QEMU compiler environment on top of the base image +docker-image-debian-powerpc-user-cross: docker-binfmt-image-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 t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \ @@ -156,6 +182,11 @@ docker: @echo @echo 'Available container images:' @echo ' $(DOCKER_IMAGES)' +ifneq ($(DOCKER_USER_IMAGES),) + @echo + @echo 'Available linux-user images (docker-binfmt-image-debian-%):' + @echo ' $(DOCKER_USER_IMAGES)' +endif @echo @echo 'Available tests:' @echo ' $(DOCKER_TESTS)' diff --git a/tests/docker/dockerfiles/debian-powerpc-user-cross.docker b/tests/docker/dockerfiles/debian-powerpc-user-cross.docker new file mode 100644 index 0000000000..6938a845ee --- /dev/null +++ b/tests/docker/dockerfiles/debian-powerpc-user-cross.docker @@ -0,0 +1,15 @@ +# +# Docker powerpc cross-compiler target for QEMU +# +# We can't use current Debian stable cross-compilers to build powerpc +# as it has been dropped as a release architecture. Using Debian Sid +# is just far too sketchy a build environment. This leaves us the +# final option of using linux-user. This image is based of the +# debootstrapped qemu:debian-powerpc-user but doesn't need any extra +# magic once it is setup. +# +FROM qemu:debian-powerpc-user + +RUN echo man-db man-db/auto-update boolean false | debconf-set-selections +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get build-dep -yy qemu