From patchwork Mon Nov 23 11:25:12 2020 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: 11925001 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-21.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4FB5DC388F9 for ; Mon, 23 Nov 2020 11:26:53 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A74AC20720 for ; Mon, 23 Nov 2020 11:26:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="GRT7fJwg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A74AC20720 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kh9zf-0001Be-6o for qemu-devel@archiver.kernel.org; Mon, 23 Nov 2020 06:26:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51846) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kh9yI-0007nY-DR for qemu-devel@nongnu.org; Mon, 23 Nov 2020 06:25:26 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:41868) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kh9yF-0004aH-4B for qemu-devel@nongnu.org; Mon, 23 Nov 2020 06:25:26 -0500 Received: by mail-wr1-x434.google.com with SMTP id 23so18184320wrc.8 for ; Mon, 23 Nov 2020 03:25:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eB7R40ZSNFHnuB0T7CKSy384tKsxN5SWBmQnsqr6fkc=; b=GRT7fJwgYMP6M9Te8QBSWmp86uDS1j0/f4q4D+TKdFSfAEn+hghM9bW9fwpoCDJh2k mBLBN1tziJn+B85UV4j/cHHQY17tDNtdl5Jzd5kgsKa05W9O2dtAvqThaGBldbr9FbJa hPzFwAPWIRJVpjo5irH9CzDVxwnMifhaHrTQu5NIXKvLpddNSRk2O9HWFEW2ZSKJj016 RAnmQ+yEmaFzmmcBFDv50MJrKCAwyg3JyAkLO5oUWTOoN+pj/Re6mpkkyI7RYWW6Ko2b F5/yoenAQpKTtda07/k/k5DiqgkfKBih0mkYfeXlROeLZ1Us8L3DbMe3PlB/9c2/p3DJ eruw== 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=eB7R40ZSNFHnuB0T7CKSy384tKsxN5SWBmQnsqr6fkc=; b=TehGitGULiWd7KufXe/G0lhofE7cxCeGRalZTGmPMqzJqW/wv9F8xyI0QHIGb15gB9 24KyTxkyZNWNFr3E23qtwCm5RCp3ITzjefsLwMoP6S8HUbfjH+bJrg3PUwdAueVJ2Ll8 yvIu+QtxjZzYMwpY/RtG6fTE+Mmd+un5TAXUNGhLd0p5JFlkRJjhDygK6cPBGofOoc7L qH0xcewR+FBlmh5eQ4tYm8epE7IEhWmQ5aBlNV5OVK3WkxUP1ZGTuv7zipNuqCJFcW5V mRPuFLi7uQq0N9TwO5hDU+wcbuz4c9X/274Kpxv6NESCPBYPeK+sZXC2MUHOWfpD3oX3 xewA== X-Gm-Message-State: AOAM533/Acza9wS+JoCV4dqzBDyQjXSxcBrdjnf4XvPlhWqD0ztQDWYz UCZ49/qQ0LrxvbNmARyXCEIAlA== X-Google-Smtp-Source: ABdhPJzcQwwxdyPIiTARflt7nsT5Ohllgt516g2Y6zI8Gr71vGkXgI5M0zL7xSGdP1d2ChGjv0FMLg== X-Received: by 2002:a5d:4f10:: with SMTP id c16mr6882418wru.39.1606130720418; Mon, 23 Nov 2020 03:25:20 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f23sm15775140wmb.43.2020.11.23.03.25.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 03:25:19 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D83611FF87; Mon, 23 Nov 2020 11:25:18 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 1/7] scripts/ci: clean up default args logic a little Date: Mon, 23 Nov 2020 11:25:12 +0000 Message-Id: <20201123112518.13425-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201123112518.13425-1-alex.bennee@linaro.org> References: <20201123112518.13425-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This allows us to do: ./scripts/ci/gitlab-pipeline-status -w -b HEAD -p 2961854 to check out own pipeline status of a recently pushed branch. Signed-off-by: Alex Bennée Reviewed-by: Wainer dos Santos Moschetta Message-Id: <20201117173635.29101-2-alex.bennee@linaro.org> diff --git a/scripts/ci/gitlab-pipeline-status b/scripts/ci/gitlab-pipeline-status index bac8233079..78e72f6008 100755 --- a/scripts/ci/gitlab-pipeline-status +++ b/scripts/ci/gitlab-pipeline-status @@ -31,7 +31,7 @@ class NoPipelineFound(Exception): """Communication is successfull but pipeline is not found.""" -def get_local_branch_commit(branch='staging'): +def get_local_branch_commit(branch): """ Returns the commit sha1 for the *local* branch named "staging" """ @@ -126,18 +126,16 @@ def create_parser(): help=('The GitLab project ID. Defaults to the project ' 'for https://gitlab.com/qemu-project/qemu, that ' 'is, "%(default)s"')) - try: - default_commit = get_local_branch_commit() - commit_required = False - except ValueError: - default_commit = '' - commit_required = True - parser.add_argument('-c', '--commit', required=commit_required, - default=default_commit, + parser.add_argument('-b', '--branch', type=str, default="staging", + help=('Specify the branch to check. ' + 'Use HEAD for your current branch. ' + 'Otherwise looks at "%(default)s"')) + parser.add_argument('-c', '--commit', + default=None, help=('Look for a pipeline associated with the given ' 'commit. If one is not explicitly given, the ' - 'commit associated with the local branch named ' - '"staging" is used. Default: %(default)s')) + 'commit associated with the default branch ' + 'is used.')) parser.add_argument('--verbose', action='store_true', default=False, help=('A minimal verbosity level that prints the ' 'overall result of the check/wait')) @@ -149,6 +147,10 @@ def main(): """ parser = create_parser() args = parser.parse_args() + + if not args.commit: + args.commit = get_local_branch_commit(args.branch) + success = False try: if args.wait: From patchwork Mon Nov 23 11:25:13 2020 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: 11925005 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C8795C2D0E4 for ; Mon, 23 Nov 2020 11:27:03 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3B49420720 for ; Mon, 23 Nov 2020 11:27:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="CuSjVxUZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3B49420720 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45732 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kh9zq-0001TT-3t for qemu-devel@archiver.kernel.org; Mon, 23 Nov 2020 06:27:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51848) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kh9yJ-0007nu-L8 for qemu-devel@nongnu.org; Mon, 23 Nov 2020 06:25:28 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:43779) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kh9yH-0004be-04 for qemu-devel@nongnu.org; Mon, 23 Nov 2020 06:25:27 -0500 Received: by mail-wr1-x42e.google.com with SMTP id s8so18182166wrw.10 for ; Mon, 23 Nov 2020 03:25:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+f08uG8G1zuCsDeFkdWQnHNS8j5fbAvdTDg/RUI/fvg=; b=CuSjVxUZeVKF2LfNPQM1Rg8pEAhpFa+m5Oy7cXr+0I5+wCYGytPvu0Y389OhawSGVk GhW8NPw5uIsm6TyR2YLQNdDia+4h0vlfndqSBXRlQr4nm1QMRG1A0K7HSymV/y80mSMQ x1fOWEE6j0S5DqdyYog9Qp2oe1kUh9wXG7I87k/+uP5eNaFT8GtNwR1uWf5KcdA3rzzv gsP+kxHxAFcU3mxcSjgXkdNHmBrIadlIuELjaHfwTPKlxKBE+o9C37abDErZmj0/o4IP vxGvTnNlbTFiAAAUjERlF8wjhZ4A3ubtiggwlGiqkwx7pBACwoaMZbyq1jFxMM71D7jI DVdQ== 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=+f08uG8G1zuCsDeFkdWQnHNS8j5fbAvdTDg/RUI/fvg=; b=lxxS6roa8b8g3Eif2DBGdeThyKYJm74MLHIayeSmni+tNHG+M8+IPVSXuizOE50imn eGfJtxjfB3dM+17wCDcGaAiZhWQj0JeScXJv1+2Qd55aqk5TaE96rolIhSfhzrYLNdVy Smgc2+Nr6fmm2934X9Wk2WD96gUaW+GsZZI09kCLnIIIACY2RWJKP7opU3y6Dn1+5yyl YI4KhSjbOEeRMCD23ezV9XfT1zK8rbzp/b5lXO3QeHLols5FqRcksG9O43SAFL8FUwgv 9E1eycZpTj83l1upHItl0DSnM5NQSQCcWp7fXPpahYuvUdokrvwVi7JgU8hq4rbV+1jK 7l3A== X-Gm-Message-State: AOAM533OY+pb13WFgginI1ck9ONvRrdvrvJqSyoYd/wFT3qvAMpum+sL 5BUV6eI9zBIEleAKzlvLK5Ptkw== X-Google-Smtp-Source: ABdhPJzkxnqR6oTSMWaZ2jtklX1PWUG4V7swHwZlBXew3C/IdlgzNQq89OEdr0zyVUxaiOxkAs39ow== X-Received: by 2002:a5d:6548:: with SMTP id z8mr11285737wrv.399.1606130723595; Mon, 23 Nov 2020 03:25:23 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o2sm18647963wrv.4.2020.11.23.03.25.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 03:25:19 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F18C01FF8C; Mon, 23 Nov 2020 11:25:18 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 2/7] tests: add prefixes to the bare mkdtemp calls Date: Mon, 23 Nov 2020 11:25:13 +0000 Message-Id: <20201123112518.13425-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201123112518.13425-1-alex.bennee@linaro.org> References: <20201123112518.13425-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Eduardo Habkost , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn=C3=A9e?= , Cleber Rosa , John Snow Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The first step to debug a thing is to know what created the thing in the first place. Add some prefixes so random tmpdir's have something grep in the code. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Thomas Huth Message-Id: <20201117173635.29101-3-alex.bennee@linaro.org> diff --git a/python/qemu/machine.py b/python/qemu/machine.py index 6420f01bed..64d966aeeb 100644 --- a/python/qemu/machine.py +++ b/python/qemu/machine.py @@ -303,7 +303,8 @@ class QEMUMachine: return args def _pre_launch(self) -> None: - self._temp_dir = tempfile.mkdtemp(dir=self._test_dir) + self._temp_dir = tempfile.mkdtemp(prefix="qemu-machine-", + dir=self._test_dir) self._qemu_log_path = os.path.join(self._temp_dir, self._name + ".log") self._qemu_log_file = open(self._qemu_log_path, 'wb') diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py index 4cda037187..307020be45 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -171,7 +171,8 @@ class Test(avocado.Test): self.cancel("No QEMU binary defined or found in the build tree") def _new_vm(self, *args): - vm = QEMUMachine(self.qemu_bin, sock_dir=tempfile.mkdtemp()) + sd = tempfile.mkdtemp(prefix="avo_qemu_sock_") + vm = QEMUMachine(self.qemu_bin, sock_dir=sd) if args: vm.add_args(*args) return vm From patchwork Mon Nov 23 11:25:14 2020 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: 11925011 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6892DC2D0E4 for ; Mon, 23 Nov 2020 11:31:13 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BCAD92078E for ; Mon, 23 Nov 2020 11:31:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="CQY8YUTI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BCAD92078E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:55052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1khA3r-0005Ni-MM for qemu-devel@archiver.kernel.org; Mon, 23 Nov 2020 06:31:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kh9yM-0007or-78 for qemu-devel@nongnu.org; Mon, 23 Nov 2020 06:25:30 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:34132) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kh9yK-0004dz-1W for qemu-devel@nongnu.org; Mon, 23 Nov 2020 06:25:29 -0500 Received: by mail-wr1-x42b.google.com with SMTP id r17so18272556wrw.1 for ; Mon, 23 Nov 2020 03:25:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=644W6rrDPLrNr7S2TwGppHLCrtDMovLSq8gfgpARDEo=; b=CQY8YUTIU+Vfsw45igkx/uBD5iwej0kVqlU/qNq+se7ZKRDoGK6kfZYertLRNqZFLP pjgSvnK+zsDy+6gb4+8W6cfg6aovjfbiCLaKf4i/JVYWeAVY8djw3GSNNDzs1Ub0CG8u 8r/Eica8yzUl1TynTPgvKR9bwkKSrTcKqtaD8J5/3NXzWfOOwHgQNe+6P8swyW9e9RS3 vdXEuVt/TrXDSL77tuSZDTxHszyD+UdhjPZVYc0nImAXOE49lgOQ98T1g3yveFWUrcWA uJLytPLGKewep0B20APb07kalnLdgfAC2tRy6oT9uQKdPNaKKxppViPdij/Zqzn2iHiD n0+w== 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=644W6rrDPLrNr7S2TwGppHLCrtDMovLSq8gfgpARDEo=; b=pXXCVcxzoyMuuRrxXuJIRBU+hgYMfl9RHXlPJsMQCCLCxqKxR1FmB/UJtfQ8b747NE O+/n9agvAysHBHNLVN1h+UBB/mnNly3pqdJiKa/ueHJ8qM8HDIEvY76UZP7LmNMNf4aW hoUIordTbdeshK7BD2csIs9SmPIc8oKqMaIi8WypzFSsX4rst6SVJ63jLImmbz+qpXDB dL6QTkR60+kG1V6Sl27r25NABlyL5Pq/J1bZ8+HJEMHT5TeJJTcMgvJ0lQGcJ4KQc4VS x3aOORDBFYqIOHZPyZjUWPceTcEPPQiSTb+vDjy69M1mfM8CMhE9dvTiMZwZAWOWqraR NX0w== X-Gm-Message-State: AOAM530V+BqOwYmkyQvChxHCWJeUyquKdE8tg8QXAGgWm/bHIOWnxqnb Ik1A2L7eKzZHsDeVTi5W7r7UAw== X-Google-Smtp-Source: ABdhPJwrtl5M5Ei5w0G87460XM+8YARKm/0rjWKPi667yBgvyJbHu2hbzGclfBvikjPRzxRalhhG8Q== X-Received: by 2002:a05:6000:89:: with SMTP id m9mr30708457wrx.412.1606130726289; Mon, 23 Nov 2020 03:25:26 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u8sm16155186wmg.6.2020.11.23.03.25.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 03:25:22 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 13E271FF8F; Mon, 23 Nov 2020 11:25:19 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 3/7] tests/avocado: clean-up socket directory after run Date: Mon, 23 Nov 2020 11:25:14 +0000 Message-Id: <20201123112518.13425-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201123112518.13425-1-alex.bennee@linaro.org> References: <20201123112518.13425-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?A?= =?utf-8?q?lex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Previously we were leaving temporary directories behind. While the QEMUMachine does make efforts to clean up after itself the directory belongs to the calling function. We use TemporaryDirectory to wrap this although we explicitly clear the reference in tearDown() as it doesn't get cleaned up otherwise. Signed-off-by: Alex Bennée Message-Id: <20201117173635.29101-4-alex.bennee@linaro.org> diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py index 307020be45..bf54e419da 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -171,8 +171,8 @@ class Test(avocado.Test): self.cancel("No QEMU binary defined or found in the build tree") def _new_vm(self, *args): - sd = tempfile.mkdtemp(prefix="avo_qemu_sock_") - vm = QEMUMachine(self.qemu_bin, sock_dir=sd) + self._sd = tempfile.TemporaryDirectory(prefix="avo_qemu_sock_") + vm = QEMUMachine(self.qemu_bin, sock_dir=self._sd.name) if args: vm.add_args(*args) return vm @@ -193,6 +193,7 @@ class Test(avocado.Test): def tearDown(self): for vm in self._vms.values(): vm.shutdown() + self._sd = None def fetch_asset(self, name, asset_hash=None, algorithm=None, From patchwork Mon Nov 23 11:25:15 2020 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: 11925013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA621C388F9 for ; Mon, 23 Nov 2020 11:33:18 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2D7632072C for ; Mon, 23 Nov 2020 11:33:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="WHasC0UJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2D7632072C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57876 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1khA5s-0006dU-VM for qemu-devel@archiver.kernel.org; Mon, 23 Nov 2020 06:33:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kh9yO-0007qD-Bj for qemu-devel@nongnu.org; Mon, 23 Nov 2020 06:25:32 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:45677) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kh9yL-0004f5-0k for qemu-devel@nongnu.org; Mon, 23 Nov 2020 06:25:30 -0500 Received: by mail-wr1-x433.google.com with SMTP id t4so5279034wrr.12 for ; Mon, 23 Nov 2020 03:25:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EBm2QW2xv0X0uMeboe0qDw8OaAc5NxhfEjgUZ3hL4ww=; b=WHasC0UJ+zQLixSCMKbszwDN87efoBie0dNEccvIu2watbjRFcW595ymKzUAu7lBfG RxHA1czcNOGJWjRDEoFpEo5l6leFqHr9+yrYVBI/1MaU2BlAL3J/AgyRU2wDjP/2dFBO N4/UzdQlEDXxmwuUOVkGoXiu7B2VXnaSUeDmwWZe7Wl2xBscdwAEFTlDGASloY+MS9Eg luIHz7o2Nx3RqFULCgyX/7WMdRvUZYMQXTB2+Q8zqJU9XhxCB3twX9ulw1Ul6/4hc/j1 mI5S+8vGRjb+1dVBzQjBlurHMjm6y3vFAOIxMGG9hqKXKTxMCWzEBAcIox3ImUjN6DVM pH9A== 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=EBm2QW2xv0X0uMeboe0qDw8OaAc5NxhfEjgUZ3hL4ww=; b=QqOjdi2xIFns+ZMOmA+WmYz4tPLc/kVKr59ccRvFwYtj8ua0tHw/0aH/z73qzE9gzr +TjAekXAD6HuLFJiDH7k7Bz/sZYDy2UlGL/BbDx9q48CJ/E+Sd3zVXm9nd7sIEmdVrw/ qc23C7HBc4GI+5UHmzLtGYuB0vm7iIh7fc4dS6SxB2CGJSgihM1bWK0/kvt0NyJAB4OK swtFvBim1RZk12kkgmVjRP7yIk3LJsPIVdDvsFny1SBuUvQb+BNYIduPgBAlfbFziihR dGlGO63gXTgJxHHEqQRWA5378QhSVFuyytB/hnhRchzr/Ow3W9xypncD8yIR7V9CCGuI dx5Q== X-Gm-Message-State: AOAM530u9fzubqqeFU/n6x6MVkjGRnqqJ7YjrBqXlIrewjk40LBlHqvC sl220B76vf/FBvYrAMzTTlRatw== X-Google-Smtp-Source: ABdhPJzEoCHjE2uX6E8Xq5unNZ/ehZOJQvjT4NVmPZgZcHvfx/uhIK9oQgU5+tr132wMeOX8OiZBQg== X-Received: by 2002:adf:f651:: with SMTP id x17mr9789980wrp.185.1606130727387; Mon, 23 Nov 2020 03:25:27 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p3sm19084334wrs.50.2020.11.23.03.25.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 03:25:23 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2C06A1FF90; Mon, 23 Nov 2020 11:25:19 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 4/7] gitlab: move remaining x86 check-tcg targets to gitlab Date: Mon, 23 Nov 2020 11:25:15 +0000 Message-Id: <20201123112518.13425-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201123112518.13425-1-alex.bennee@linaro.org> References: <20201123112518.13425-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Thomas Huth , =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The GCC check-tcg (user) test in particular was very prone to timing out on Travis. We only actually need to move the some-softmmu builds across as we already have coverage for linux-user. As --enable-debug-tcg does increase the run time somewhat as more debug is put in let's restrict that to just the plugins build. It's unlikely that a plugins enabled build is going to hide a sanity failure in core TCG code so let the plugin builds do the heavy lifting on checking TCG sanity so the non-plugin builds can run swiftly. Now the only remaining check-tcg builds on Travis are for the various non-x86 arches. Signed-off-by: Alex Bennée Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Thomas Huth Message-Id: <20201117173635.29101-5-alex.bennee@linaro.org> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9a8b375188..b406027a55 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -247,6 +247,15 @@ build-user: CONFIGURE_ARGS: --disable-tools --disable-system MAKE_CHECK_ARGS: check-tcg +# Only build the softmmu targets we have check-tcg tests for +build-some-softmmu: + <<: *native_build_job_definition + variables: + IMAGE: debian-all-test-cross + CONFIGURE_ARGS: --disable-tools --enable-debug-tcg + TARGETS: xtensa-softmmu arm-softmmu aarch64-softmmu alpha-softmmu + MAKE_CHECK_ARGS: check-tcg + # Run check-tcg against linux-user (with plugins) # we skip sparc64-linux-user until it has been fixed somewhat # we skip cris-linux-user as it doesn't use the common run loop @@ -258,6 +267,14 @@ build-user-plugins: MAKE_CHECK_ARGS: check-tcg timeout: 1h 30m +build-some-softmmu-plugins: + <<: *native_build_job_definition + variables: + IMAGE: debian-all-test-cross + CONFIGURE_ARGS: --disable-tools --disable-user --enable-plugins --enable-debug-tcg + TARGETS: xtensa-softmmu arm-softmmu aarch64-softmmu alpha-softmmu + MAKE_CHECK_ARGS: check-tcg + build-clang: <<: *native_build_job_definition variables: diff --git a/.travis.yml b/.travis.yml index a3d78171ca..bac085f800 100644 --- a/.travis.yml +++ b/.travis.yml @@ -301,32 +301,6 @@ jobs: - ${SRC_DIR}/configure ${CONFIG} --extra-cflags="-g3 -O0 -fsanitize=thread" || { cat config.log meson-logs/meson-log.txt && exit 1; } - # Run check-tcg against linux-user - - name: "GCC check-tcg (user)" - env: - - CONFIG="--disable-system --enable-debug-tcg" - - TEST_BUILD_CMD="make build-tcg" - - TEST_CMD="make check-tcg" - - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg" - - - # Run check-tcg against softmmu targets - - name: "GCC check-tcg (some-softmmu)" - env: - - CONFIG="--enable-debug-tcg --target-list=xtensa-softmmu,arm-softmmu,aarch64-softmmu,alpha-softmmu" - - TEST_BUILD_CMD="make build-tcg" - - TEST_CMD="make check-tcg" - - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg" - - - # Run check-tcg against softmmu targets (with plugins) - - name: "GCC plugins check-tcg (some-softmmu)" - env: - - CONFIG="--enable-plugins --enable-debug-tcg --target-list=xtensa-softmmu,arm-softmmu,aarch64-softmmu,alpha-softmmu" - - TEST_BUILD_CMD="make build-tcg" - - TEST_CMD="make check-tcg" - - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg" - - name: "[aarch64] GCC check-tcg" arch: arm64 dist: focal From patchwork Mon Nov 23 11:25:16 2020 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: 11925003 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F296BC2D0E4 for ; Mon, 23 Nov 2020 11:27:00 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5B80D20720 for ; Mon, 23 Nov 2020 11:27:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="JOSWSiix" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5B80D20720 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45456 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kh9zn-0001LG-5Y for qemu-devel@archiver.kernel.org; Mon, 23 Nov 2020 06:26:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51954) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kh9yQ-0007wE-RP for qemu-devel@nongnu.org; Mon, 23 Nov 2020 06:25:34 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:34772) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kh9yO-0004hY-08 for qemu-devel@nongnu.org; Mon, 23 Nov 2020 06:25:34 -0500 Received: by mail-wm1-x32a.google.com with SMTP id x13so7481754wmj.1 for ; Mon, 23 Nov 2020 03:25:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pcPW5SyZ28a3ANzUZ9mcRABSoaLjoW2PPQzUbpyQ/Bg=; b=JOSWSiixoQGp1ta5bQxAhgcFtPVGpK59PTwLbtzY3OK9er75wU4pCIsiG8oXwzDnNP jBRg7jW1s3B0wo7I5I7u9kefoFM/gCn9oJYP0vrAIBSe2jS69MeTtHAwJe6UwoVa0lWc 9lMh/n4Vu/xCbVoa0PPQHodsg1LF9pifeW6IdfgZoyHwV3fkF/zaP1ifHWyLSx7mOfOd VIIN+PyGQSkdqBBJMF2oMHwD9bB1dTP70h9yvZddhnXn2tugPEPK06QQN5VQrTk07BB8 16ehz6JCNwu0Uomrk93VyqwjFjtGfGe7vXcDpmb5EKE66y8+JZRD/+ecKCAOPFssrORa o0Zw== 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=pcPW5SyZ28a3ANzUZ9mcRABSoaLjoW2PPQzUbpyQ/Bg=; b=G44UFR/n/F/X3JB5j2Zx/A7EAUBMBXKMjiyb4wuOr2BvguTWHRoIV++/eGIwq81oVM lgy2N1uzONxzwWBL7G6WTISELXxSdPsmkQLYMfnx2b4R2tz9XV/gFw7MPDC3bBF6EDv9 HQjRDhozUMR0nhY11bmlv52r6seTZ65/B5O0V2mxq4U9cUzdivAvChBT647DRfnHNq86 bmaccr54DTds7T9r8d+QLhAFVUz1jPG0bsWT68GuZ/hlK2OkV9gbEF8+JGHW2b7fyAtS +GKwTpAfCFVd3EgIVvplt5LymmNVZ48rKxldEwHqD3E0GDtYMgD/DVX89WWXpgVJGOyn 05HQ== X-Gm-Message-State: AOAM532pPUMYtYJwOWGR6mwyAfjNBf4lU1ttCJ1u8q0k83yTTzWp26e0 FzXIioseNdtRNbOyvSjgvuXLaQ== X-Google-Smtp-Source: ABdhPJzjKFTkEsdAON3KVS0h1066Qqe5Gqi0MKnivfi/3CMTNIhLGS5i/Dyy0ZgVmkY+IWpW76SxOg== X-Received: by 2002:a1c:9901:: with SMTP id b1mr23084502wme.18.1606130729444; Mon, 23 Nov 2020 03:25:29 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f4sm9889938wmb.47.2020.11.23.03.25.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 03:25:25 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 428651FF91; Mon, 23 Nov 2020 11:25:19 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 5/7] tests/docker: Install liblttng-ust-dev package in Ubuntu 20.04 image Date: Mon, 23 Nov 2020 11:25:16 +0000 Message-Id: <20201123112518.13425-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201123112518.13425-1-alex.bennee@linaro.org> References: <20201123112518.13425-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Install the liblttng-ust-dev package to be able to build QEMU using the User-Space Tracer trace backend (configure --enable-trace-backends=ust). Suggested-by: Wainer dos Santos Moschetta Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20201111121234.3246812-2-philmd@redhat.com> Message-Id: <20201117173635.29101-6-alex.bennee@linaro.org> diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 355bbb3c63..ae889d8482 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -23,6 +23,7 @@ ENV PACKAGES flex bison \ libiscsi-dev \ libjemalloc-dev \ libjpeg-turbo8-dev \ + liblttng-ust-dev \ liblzo2-dev \ libncurses5-dev \ libncursesw5-dev \ From patchwork Mon Nov 23 11:25:17 2020 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: 11925015 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86EF4C388F9 for ; Mon, 23 Nov 2020 11:35:10 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C13B82072C for ; Mon, 23 Nov 2020 11:35:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="KuJL7Ywi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C13B82072C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1khA7g-0000Ty-N7 for qemu-devel@archiver.kernel.org; Mon, 23 Nov 2020 06:35:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51956) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kh9yR-0007wo-49 for qemu-devel@nongnu.org; Mon, 23 Nov 2020 06:25:35 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:36327) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kh9yO-0004i2-8L for qemu-devel@nongnu.org; Mon, 23 Nov 2020 06:25:34 -0500 Received: by mail-wm1-x333.google.com with SMTP id a65so16888077wme.1 for ; Mon, 23 Nov 2020 03:25:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ha7GtIAF1I/0DbH6VrBKGbJXyrL4nzb53Wtfo6JIF00=; b=KuJL7YwitqfuTeahBLbBAE73gsB2IWoY7f3Vicy6kFlnpr30ZKOpAMCj4KkTTSpmg5 kjno4CNLRPjioEAhB54GJjjHXeOny1btpx9mRMgbfc5k66oEE84Q6l4/K8Oa3GU/JFKN cGqdId6/+SCJRgc+jt7FNG4jCHV9ZOe0COrFEnEHIp0RqU86KkrPSU1jI1D+H9wHxB+y 5XkosEwl2rzcCgyASL22qtDV6ESMjkr1OrUcGoz4tMNlXs/m+vG9ijZQb7v+A0D6TE70 1oi34vGMXAJr6X1WzKDoa8wteEq9yMLxPC4p7Qv3lj6HnVVQIPLxlGkGzaMB4GaNawhE Sm+w== 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=ha7GtIAF1I/0DbH6VrBKGbJXyrL4nzb53Wtfo6JIF00=; b=SGjICGvHVzAMNiCTt74aDU51GFA/5C9CJeQxaJlxJLe4xi1PGubyURc4OdtBBxgmtC WbWhFX9MwFJFUUqyWtEzTXBOHuJMVNOUu6xPXyO6KdYUmKlVEcnlrHPGCgMHLLR9XrL3 zVCKCuhclIDObciRwxXQ7qfgBlPf32InegiPG6oyo+3KjGu3ll8hYpLWnlrXnrPT0+l3 hPC9saD18C2SDV/Omc6FaheXiaCSw0/XoeDMXZbuIuynU6dVCN3fQ9xA4utbN+fvCOJv A+XvE2omvL8ATcgs6cac4d60pQBmo8rmpGRjsaYxDQFt9UmZkwmcWLIs9saMaFuxaROX hSXQ== X-Gm-Message-State: AOAM531AI/KvY1a6PIX9bZZ/wlq+Gxpd/J/wTlcHEqFqWBukCXYZ2LEx vy1gymmnXOxqiegc9FBOoFL+7Q== X-Google-Smtp-Source: ABdhPJykCjx8iE3WbkChjSqaV9MFUK/G8T8O59vdMUflhAA8uEQg3rrBwXPVxO/VdX1CEvaXgFs4aQ== X-Received: by 2002:a1c:9652:: with SMTP id y79mr24077791wmd.71.1606130730721; Mon, 23 Nov 2020 03:25:30 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h4sm18416224wrq.3.2020.11.23.03.25.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 03:25:25 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 592A21FF92; Mon, 23 Nov 2020 11:25:19 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 6/7] gitlab-ci: Move trace backend tests across to gitlab Date: Mon, 23 Nov 2020 11:25:17 +0000 Message-Id: <20201123112518.13425-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201123112518.13425-1-alex.bennee@linaro.org> References: <20201123112518.13425-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Thomas Huth , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Similarly to commit 8cdb2cef3f1, move the trace backend tests to GitLab. Note the User-Space Tracer backend is still tested on Ubuntu by the s390x jobs on Travis-CI. Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Acked-by: Thomas Huth Message-Id: <20201111121234.3246812-3-philmd@redhat.com> Message-Id: <20201117173635.29101-7-alex.bennee@linaro.org> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b406027a55..d0173e82b1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -415,6 +415,24 @@ check-crypto-only-gnutls: IMAGE: centos7 MAKE_CHECK_ARGS: check +# We don't need to exercise every backend with every front-end +build-trace-multi-user: + <<: *native_build_job_definition + variables: + IMAGE: ubuntu2004 + CONFIGURE_ARGS: --enable-trace-backends=log,simple,syslog --disable-system + +build-trace-ftrace-system: + <<: *native_build_job_definition + variables: + IMAGE: ubuntu2004 + CONFIGURE_ARGS: --enable-trace-backends=ftrace --target-list=x86_64-softmmu + +build-trace-ust-system: + <<: *native_build_job_definition + variables: + IMAGE: ubuntu2004 + CONFIGURE_ARGS: --enable-trace-backends=ust --target-list=x86_64-softmmu check-patch: stage: build diff --git a/.travis.yml b/.travis.yml index bac085f800..1f80bdb624 100644 --- a/.travis.yml +++ b/.travis.yml @@ -232,25 +232,6 @@ jobs: - TEST_CMD="" - # We don't need to exercise every backend with every front-end - - name: "GCC trace log,simple,syslog (user)" - env: - - CONFIG="--enable-trace-backends=log,simple,syslog --disable-system" - - TEST_CMD="" - - - - name: "GCC trace ftrace (x86_64-softmmu)" - env: - - CONFIG="--enable-trace-backends=ftrace --target-list=x86_64-softmmu" - - TEST_CMD="" - - - - name: "GCC trace ust (x86_64-softmmu)" - env: - - CONFIG="--enable-trace-backends=ust --target-list=x86_64-softmmu" - - TEST_CMD="" - - # Using newer GCC with sanitizers - name: "GCC9 with sanitizers (softmmu)" dist: bionic From patchwork Mon Nov 23 11:25:18 2020 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: 11925009 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6A479C2D0E4 for ; Mon, 23 Nov 2020 11:28:55 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 971D720738 for ; Mon, 23 Nov 2020 11:28:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="eS7S8uLQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 971D720738 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1khA1d-00041C-K8 for qemu-devel@archiver.kernel.org; Mon, 23 Nov 2020 06:28:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51960) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kh9yR-0007y8-Nf for qemu-devel@nongnu.org; Mon, 23 Nov 2020 06:25:35 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:37387) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kh9yP-0004j2-Ss for qemu-devel@nongnu.org; Mon, 23 Nov 2020 06:25:35 -0500 Received: by mail-wr1-x429.google.com with SMTP id b6so18250854wrt.4 for ; Mon, 23 Nov 2020 03:25:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uf1eDGIAVRH0GmKGtydyGY1impeWIIls55yo/sTzgkw=; b=eS7S8uLQZZPbeprtrYdGSJX7dG+JCVUN1/sSmM0V+MU/LWkxZgMBfUZW5B0Xorc7/4 sWDEQnRYmnoqzKyT2XPNygj5T2PmBqHMSIZ+k8vSi2A3o812KJOyuzd8gtHBKBYzMyED fyfDH3ecC0yIBcN1e30HtDQWsXa2/txbeJNy2FxpYqadrUCFiQXnQaPJfTiZ98v729v5 6KkptW7Ci1r2z0pmEcL+k5/X8/6LTZMcDMgtfYPB9U0L62IMnDDgLlWmVO8rQgOLOnYD /BgeoDKPT4tE/9Eu+mGvz7/6D+ssQwu9y4iDFKnVgBmPVAptUW7gsXG+eZO1BwWbLCLQ foWw== 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=uf1eDGIAVRH0GmKGtydyGY1impeWIIls55yo/sTzgkw=; b=p0WXkbMQqXJU4m40lfLf5Q5ytXW0fYTNAUPIEcBJtX+nG4bK4IIPgsXUQ535nQ2Qsv AvitoExrqwp5PP1rdPqRLyDqZ1GCp2FaI0NrV+kJIstExlWmeZx2rh+vYckJQ2JkIpx3 WTXwCefO6IkXWwsPgpESClsAn65QWvL7tWppnCkEbj/7Nrq8aX9PCZUCTLhmbW7dQaoC Tu2QWZtVbTTTUnLkpoVXzdQzrdtfMo9SzKodgUuKhKQkWRTnTfvPJUVFjUIt3L/11j/y Z9XvVYaD8P+xU2AO3pqTKI03FFXebnQtAkRMmfM1iVe6/VBEOrkSXDLsmUj73tCT6ggM Nn4A== X-Gm-Message-State: AOAM530kVHO5zTDh47kzLoafkUSnOW+a/HS0i+ruRg7h8jn7ZhvbEfmI Ar/P5K9zAD6P1beNXNhqAlv+EQ== X-Google-Smtp-Source: ABdhPJykIEqL09maLWwn2VPJyW5P0MqEpsyybXsLBMmSvvWDgUOzynt+IZYAXdLghGvhsphQ6kTONw== X-Received: by 2002:a5d:6310:: with SMTP id i16mr30066311wru.284.1606130732344; Mon, 23 Nov 2020 03:25:32 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u8sm16155389wmg.6.2020.11.23.03.25.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 03:25:25 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7175B1FF93; Mon, 23 Nov 2020 11:25:19 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 7/7] .cirrus.yml: bump timeout period for MacOS builds Date: Mon, 23 Nov 2020 11:25:18 +0000 Message-Id: <20201123112518.13425-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201123112518.13425-1-alex.bennee@linaro.org> References: <20201123112518.13425-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ed Maste , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Li-Wen Hsu Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" These seem to trigger timeouts with some regularity. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20201118140739.18377-1-alex.bennee@linaro.org> Signed-off-by: Alex Bennée diff --git a/.cirrus.yml b/.cirrus.yml index f0209b7a3e..08db7c419f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -18,6 +18,7 @@ freebsd_12_task: - gmake -j$(sysctl -n hw.ncpu) check V=1 macos_task: + timeout_in: 90m osx_instance: image: catalina-base install_script: @@ -32,6 +33,7 @@ macos_task: - gmake check V=1 macos_xcode_task: + timeout_in: 90m osx_instance: # this is an alias for the latest Xcode image: catalina-xcode