From patchwork Tue Nov 17 17:36:30 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: 11913049 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B3E486C1 for ; Tue, 17 Nov 2020 17:37:48 +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 24B8A20678 for ; Tue, 17 Nov 2020 17:37:48 +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="GycsO4oX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 24B8A20678 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:53074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kf4vL-0003bF-4v for patchwork-qemu-devel@patchwork.kernel.org; Tue, 17 Nov 2020 12:37:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kf4uK-0001jW-L1 for qemu-devel@nongnu.org; Tue, 17 Nov 2020 12:36:44 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:41407) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kf4uH-0006LX-GC for qemu-devel@nongnu.org; Tue, 17 Nov 2020 12:36:44 -0500 Received: by mail-wr1-x442.google.com with SMTP id 23so24001434wrc.8 for ; Tue, 17 Nov 2020 09:36:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4bxNoNpIYS1T/aRH111mxpGinkwiUwBd/6PUA0HCz5Y=; b=GycsO4oXG89OE+ilq+k6SXEfNbo5UOZqO1xvAozCW8RpFfIxS06ktkpZZdpk+0QVsF FxWB2pRVqVPegaXXwSfVlOVovQ7d8XPWuPVRr3Gf7Int6fZbi2QEj9uXvMjvrNY4Eaj6 kALkcJZwWBtzEazRvQbRRAHBbUSX3WOy2dKm5NwNw/bztVkRiVst3xj49Dn2ceMC2NjX E8No2qOnpcX2XpNuXn8vOYTvOJIvC97PsYH2wdhFIfgmjqVahj8hMUujPLScK8exhbI/ sDHk5eftbpU5aK3CpY7CcLMuAK4JNBCPKVVybpuoMfgZN14YeEsqb9yCpXIVhKDpXhAw isIA== 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=4bxNoNpIYS1T/aRH111mxpGinkwiUwBd/6PUA0HCz5Y=; b=etj5ZXDm8DPI2MVXAwogUo0DgplZ8854djHlCrH1+Hv361NR3Xf48tirzav9+CRN75 k7abzoUaLHOGAcBO7ylz3oUdV27oEwn67KKDmEOQhXUWTJss2ZeQXIiGlFBCmADa8hCf GiBee/CCbZUCB8bitTNWXCLqOqyUAjVKXc2XoweZpgEqDvYVjjBR430K69S8UIKzqhsQ rrc1CQ9W4BEUAz/7KHCPfkQqeyB3XrJGXQIj5EgnIwaRqTf0uJPd15YNc8cHhNwJaPcp Rn1Ys/4efuReq3WAthM9aV95ZDhAgRholsKKy4DVmkVYR6oWIFT93j8mJ9Bw/Re5rdam zKww== X-Gm-Message-State: AOAM532DbxLhZ7GlFh4ayJrjtJHYYOzRwaY8jWHTKy57/q1x9C/ZCXhs bu9DgTRUII+maIgs0r0Xc179WQ== X-Google-Smtp-Source: ABdhPJwSAaxdXXIf9I8bzNGohOEYcBKNNd5aY+1m9T029pQY1vYIADiw1yHDQG/rW8XKpTihmkUVmQ== X-Received: by 2002:adf:eacb:: with SMTP id o11mr681631wrn.208.1605634598189; Tue, 17 Nov 2020 09:36:38 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u85sm4831302wmu.43.2020.11.17.09.36.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 09:36:36 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 731F31FF87; Tue, 17 Nov 2020 17:36:35 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 1/6] scripts/ci: clean up default args logic a little Date: Tue, 17 Nov 2020 17:36:30 +0000 Message-Id: <20201117173635.29101-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201117173635.29101-1-alex.bennee@linaro.org> References: <20201117173635.29101-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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: peter.maydell@linaro.org, Thomas Huth , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.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 --- scripts/ci/gitlab-pipeline-status | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) 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 Tue Nov 17 17:36:31 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: 11913047 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9AF156C1 for ; Tue, 17 Nov 2020 17:37:44 +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 10A3C20678 for ; Tue, 17 Nov 2020 17:37:43 +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="ZO5iP5xy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 10A3C20678 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:52616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kf4vG-0003Q1-PS for patchwork-qemu-devel@patchwork.kernel.org; Tue, 17 Nov 2020 12:37:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59806) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kf4uL-0001kd-BI for qemu-devel@nongnu.org; Tue, 17 Nov 2020 12:36:45 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:38628) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kf4uI-0006MT-3h for qemu-devel@nongnu.org; Tue, 17 Nov 2020 12:36:45 -0500 Received: by mail-wm1-x332.google.com with SMTP id 1so2499564wme.3 for ; Tue, 17 Nov 2020 09:36:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CbOi5+WP6WrA/d0FgepLR05MMDG8YalJxPttC+Q6vfg=; b=ZO5iP5xyAd5aOAXmu3vt4k0uiHwY/Pp71Da85mU9izXmaidHO4gu/1SCkhtEnklyGq IIIOq1F7bcMyEmlvZay/ihTNhVoIx2TN59ca+TA5z+hJl2ls/iC3awekrnadG3YybY/m l6JWc44ojmXKjr4/w2jrfwLQYeiTiTd/rem/doPrjF4bDwJ0T8xzA9Y98l+D1WfD8ZAw 3hwHjVoOT6cK5I7f7YyNEoId8p5d/zmcrqxmKgRe2/8zoOY0vkol+w9hZWCrQqUKlVa7 7912jjdoEQDMUBHFXaTa7kT18psBxcfzbIhdhDzUMpajZw3b69J34NDDtBXKyIwu2i5i NXnw== 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=CbOi5+WP6WrA/d0FgepLR05MMDG8YalJxPttC+Q6vfg=; b=EDMzX7mG9ZyRgvx9VsZ25ZfO5N9moDwIGHUMNtFgoNxMbevya1nBZ6AGrt+PCMcQ3Z lWJiOyqLRxaatJuBUJ2D4wVAL51beivzv4zYLkQZRfDRuVtPhiiimLjgdHF5V183jLUX lIL9Onc7Q8ZLPQMulPEeD0ZSJqNP+DmLT6oj31WAWYzf2nzF5ggoIYucUc2zy2SJ+gc3 bwzB8uTYgWSihZEN9vmY8z4lglucb0QiZJWb94ldckHya9u5Gm+Uony/szG5Hvp/8rQ1 o6hMuZpvwE6VOZX6BoCYAR3i20CBVNPoHEbFhzyJOP6Os3tcU19iCrefRx8gM1MowotU dhvg== X-Gm-Message-State: AOAM533Yy0PDAAyEgY5ZoBV4NJvz3g6+jXGi+UQ0ysuvUgcS62x5PtJn HS5r+HceWncIb/pwNV21VnaBbA== X-Google-Smtp-Source: ABdhPJwQVrSrkukQ7X9y5bthDb48qI72A3SsYSVitG8AAqYxhKO82p+ycemMFkTjygup4s8udszB6Q== X-Received: by 2002:a7b:c384:: with SMTP id s4mr175136wmj.77.1605634600708; Tue, 17 Nov 2020 09:36:40 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o13sm4639547wmc.44.2020.11.17.09.36.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 09:36:36 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8C2CC1FF8C; Tue, 17 Nov 2020 17:36:35 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 2/6] tests: add prefixes to the bare mkdtemp calls Date: Tue, 17 Nov 2020 17:36:31 +0000 Message-Id: <20201117173635.29101-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201117173635.29101-1-alex.bennee@linaro.org> References: <20201117173635.29101-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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: peter.maydell@linaro.org, Eduardo Habkost , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Cleber Rosa , John Snow Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.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: Thomas Huth Reviewed-by: Wainer dos Santos Moschetta --- v2 - fix long lines --- python/qemu/machine.py | 3 ++- tests/acceptance/avocado_qemu/__init__.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) 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..3033b2cabe 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="avocado_qemu_sock_") + vm = QEMUMachine(self.qemu_bin, sock_dir=sd) if args: vm.add_args(*args) return vm From patchwork Tue Nov 17 17:36:32 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: 11913059 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CFB0B1398 for ; Tue, 17 Nov 2020 17:39:42 +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 7872324654 for ; Tue, 17 Nov 2020 17:39:42 +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="mTZhIZwm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7872324654 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:60380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kf4xB-0006iG-FI for patchwork-qemu-devel@patchwork.kernel.org; Tue, 17 Nov 2020 12:39:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59814) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kf4uL-0001ld-RH for qemu-devel@nongnu.org; Tue, 17 Nov 2020 12:36:45 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:38630) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kf4uJ-0006Mf-66 for qemu-devel@nongnu.org; Tue, 17 Nov 2020 12:36:45 -0500 Received: by mail-wm1-x334.google.com with SMTP id 1so2499628wme.3 for ; Tue, 17 Nov 2020 09:36:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iZ6emmsVGopMBicjEoGUTBo8VBEOaBaz0b4I5fK20m8=; b=mTZhIZwmq/aPdobm+ylhLINwVqdw23gHoYv5vTN8s0SnP7XZ9Pz34n8nP93OUz75o7 muKrCLpVMtgt0oFXbBe4RmDBJ8EYnyPX784bOty9rQS3wCKS4HG8xsoaMo43laFWkAza kmy+4exEKfFKItKeCUfxnZQ7zhBHunOu1ZTe9MEr8xFK/0kI7yHAHY0o8Av1Gn0w9sh/ XwIBauXe8Xm+T1/ckQqBcYvFV6QHJwowwwQhXahees0bxtyfp5zdHngnkQLH85+iLrKL Inv43AUTErxULyYPiWOllnGjl5xS7IuzxtEmvQmE9sXsdatA2fZ8SLZYc7Wv+F5xO/Xd ET1Q== 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=iZ6emmsVGopMBicjEoGUTBo8VBEOaBaz0b4I5fK20m8=; b=pIrFWFjUVQkzN5pYEK1NdnRTRiSIt/f1Jp1PQXELEbZKbzSTSp5AOjq/iZiZBNcq7i YDCpyqCw5ZKxoma8mnCE4+KQuylo6rxDkRTIK+nvoM9z/tyg9quw46G62+KjftUe5ijv XO5oqkpKle9janaCJXz0RP6a4zT3AfTwIWrpBsm39ur1/UbXgldNKc1ygwVRdvZrgEVo JiZrRuotjCr12f8nawXEQzyPzUvRgMI7LEiwlOullhEsMD2NGwxC08/VLWMRkwPs9v9H 7RyupvvU/U1Yjq15UbEgQpFZZcwtXjZ3k9B9FMtRRl2a4T6yaxPks3nCYKwVBOXCokX2 W58A== X-Gm-Message-State: AOAM532tWtvQFwrOSimiPH7Pz94U0kot8IgyUK7reT6LofEsPDCrrteN HzIr538kgbWqZoYs9RVo2A34wQ== X-Google-Smtp-Source: ABdhPJy1DdftWS9IGZaLsK4wRjPMBE80qT1sRFfVWdj+l8bSV0uXHL3RLdGxoFlInd5Md92IMxGcNw== X-Received: by 2002:a1c:d0:: with SMTP id 199mr194149wma.148.1605634601911; Tue, 17 Nov 2020 09:36:41 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 31sm6889143wre.43.2020.11.17.09.36.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 09:36:37 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A56F41FF8F; Tue, 17 Nov 2020 17:36:35 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 3/6] tests/avocado: clean-up socket directory after run Date: Tue, 17 Nov 2020 17:36:32 +0000 Message-Id: <20201117173635.29101-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201117173635.29101-1-alex.bennee@linaro.org> References: <20201117173635.29101-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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: peter.maydell@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.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 Reviewed-by: Wainer dos Santos Moschetta --- tests/acceptance/avocado_qemu/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py index 3033b2cabe..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="avocado_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 Tue Nov 17 17:36:33 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: 11913063 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 22B21175A for ; Tue, 17 Nov 2020 17:39:52 +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 C661A246B1 for ; Tue, 17 Nov 2020 17:39:51 +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="hjYavtMQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C661A246B1 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:33012 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kf4xK-00075s-QW for patchwork-qemu-devel@patchwork.kernel.org; Tue, 17 Nov 2020 12:39:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59872) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kf4uQ-0001zN-La for qemu-devel@nongnu.org; Tue, 17 Nov 2020 12:36:50 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:35101) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kf4uL-0006No-4u for qemu-devel@nongnu.org; Tue, 17 Nov 2020 12:36:50 -0500 Received: by mail-wm1-x341.google.com with SMTP id w24so4015900wmi.0 for ; Tue, 17 Nov 2020 09:36:44 -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=rAMQantiot8HqhvJdu7BmWOVAam67OVmYlUn7ZUYJ3k=; b=hjYavtMQ6wBkyFO5xxMVozB8WBgGwW3vbss3RvbANvNitR3yj3UDP46YYj2/iCSzpQ 947HVqLDaNiBRJnShyBYXaOTTqYe0yS/0q4AXk2DOOVpjeSBXUyRT/paVqh4x4Kvz9us Rb58jddKrpyHbOqkTQo4yb2nMALkUCoCNUgwdWFv0OEjQVU7/xPn247LvBdbJpWZfjTn pwIWB8PX8mhxzbcQC85Pico9f0JQPx2PlRbClOy7N7FEB9XdjwDjLfjK2hvXi7sUjGFE CkF0jW/VszHXnwUYIlXONtZaoEM/nTI0QT5UDbWFMRzPMCi8wAvy22dm9lMsz7WcSQ9D DvKQ== 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=rAMQantiot8HqhvJdu7BmWOVAam67OVmYlUn7ZUYJ3k=; b=l2syzP6ByleklBDHVfmdi/ERHlqYvPGcmQJAblGvNgo7YXeTaYqVjOtME13fhvcwCJ V4rsdmJ2CzjgwGc7HfylRe17za9cQA/d3LH3nJo8guTQAmV3pfea3Z3+jr5xdMyurAJL /1BFU3VvUCcN0bmqf/4fXVJ70JkrWcyY21lkMwDSdVq+litbiPqEZKTqRBup6LP+gxuI Jh6kxbriq2GyPQbMwfSsPH0aq4i5JCKM79LPWnXzmiDGAcNL6hCiNRSSDNgI2BuN1wL7 YcFabjm5af739e2B6gvgVju+9id8RuWfgC8AdLXwj8hy7PRx6/y6mbIKFKWnF3Ap5wOv ohAQ== X-Gm-Message-State: AOAM531E/049mWoCeHLUVskwZCcKu/I7XwzqgR8lrZ8iSkVl/gWVE8tP EgJmwx7xphGjinhUKY5PzYGgGQ== X-Google-Smtp-Source: ABdhPJy3ysUoD2GApKwmsJJWV/tOLmmgpqWtnzAhbv3Xia/XoBpYHTzPJVLXMKW1Yx1HHPR1AexcGg== X-Received: by 2002:a1c:1fcc:: with SMTP id f195mr163169wmf.121.1605634603787; Tue, 17 Nov 2020 09:36:43 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t9sm28684559wrr.49.2020.11.17.09.36.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 09:36:38 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BE4BF1FF90; Tue, 17 Nov 2020 17:36:35 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 4/6] gitlab: move remaining x86 check-tcg targets to gitlab Date: Tue, 17 Nov 2020 17:36:33 +0000 Message-Id: <20201117173635.29101-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201117173635.29101-1-alex.bennee@linaro.org> References: <20201117173635.29101-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::341; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x341.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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 , peter.maydell@linaro.org, Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.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 Message-Id: <20201110192316.26397-10-alex.bennee@linaro.org> Reviewed-by: Thomas Huth Reviewed-by: Wainer dos Santos Moschetta --- .gitlab-ci.yml | 17 +++++++++++++++++ .travis.yml | 26 -------------------------- 2 files changed, 17 insertions(+), 26 deletions(-) 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 Tue Nov 17 17:36:34 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: 11913061 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CDDC7174A for ; Tue, 17 Nov 2020 17:39:43 +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 79EBF24654 for ; Tue, 17 Nov 2020 17:39:43 +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="g5N5Lrp0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 79EBF24654 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:60458 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kf4xC-0006k5-HE for patchwork-qemu-devel@patchwork.kernel.org; Tue, 17 Nov 2020 12:39:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59850) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kf4uO-0001qX-0D for qemu-devel@nongnu.org; Tue, 17 Nov 2020 12:36:48 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:45040) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kf4uM-0006O9-6V for qemu-devel@nongnu.org; Tue, 17 Nov 2020 12:36:47 -0500 Received: by mail-wr1-x434.google.com with SMTP id c17so23995072wrc.11 for ; Tue, 17 Nov 2020 09:36:45 -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=Ei6m6g24qzbcjxbzjmWWksZvgukx3CamFhIUp7GgYoc=; b=g5N5Lrp0KMD71fbF2iCZ0qk9FPwvALBqs7nWnHFM0Ty+TGJ1Gvifp7MXVsiSTQDDIj 5ysgFkdsVP/Z3aV6GKE06LiQ1skXl9HRJa5fpDyCVTdY9bfxP/t3/OatpMXqKc//xk66 Q77fyaorT6nQ0PzpJrlcDVd8aP/mSnCD5dWyS+QpAYpbjL4RJZPi5q+scwkt9yIIpMXj mZ4KhhNEMpTqrbrZp3qnRtv8WD/zh74+5vndthBCnaou+PF0f7xq6TAv2My6ffSMgHDg nOslQF0qBNGRea1dH8Bps8x0X/nqgMzu84S2/xqAxQYKbPv7VtHDai8p722e7IhnUk4u IXIA== 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=Ei6m6g24qzbcjxbzjmWWksZvgukx3CamFhIUp7GgYoc=; b=caA2rX2mWs4hwqstXIaBGZVB0/80Nt6TxOj9s3SBI/lEzfTnwVkctM6pHsusmSrW3r KBUP9OFDiRhorglcVc8e8txuUhGlN9daF9gm6+WpLFQlQKaGrQP7vZ65DLnwe23ZcTnU do4LVg1apRXqP2FiLQt5JzvTlQGwYXnIv8s038ZsVvgLR+Qgkrk0B1tGuKIyqJRVnhjx XjIaZRDD8jLymiJEJlCEDI3YweSEAdWvxnm30sJDmT6MZ4ltZ7hjVYb01/LAKt5XsHy7 f+pbgAZP4WVtuHHM5gkQSxtsmr/++GWvJ6xt41f2VTzGI1M0QgwvhWqjlabOoVxDZd4n /tRA== X-Gm-Message-State: AOAM532gtHO/7zAS5vhNZ3lNKImeu5K1Rp0vJVkWRImdGfYoz6ZKUYL4 UAw3QL7aOYgWrD5QzS1D2v9D9A== X-Google-Smtp-Source: ABdhPJzxn/OByqFD8rUlEMBXeTRUFSZkn8Jwt+FZX5up+Th/8iutZe1MrMpYtiBmyHjoel8mZMEpvQ== X-Received: by 2002:adf:eacb:: with SMTP id o11mr682061wrn.208.1605634604875; Tue, 17 Nov 2020 09:36:44 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n23sm4340595wmk.24.2020.11.17.09.36.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 09:36:42 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D62921FF91; Tue, 17 Nov 2020 17:36:35 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 5/6] tests/docker: Install liblttng-ust-dev package in Ubuntu 20.04 image Date: Tue, 17 Nov 2020 17:36:34 +0000 Message-Id: <20201117173635.29101-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201117173635.29101-1-alex.bennee@linaro.org> References: <20201117173635.29101-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-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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?Alex_Benn=C3=A9e?= , peter.maydell@linaro.org, Fam Zheng , =?utf-8?q?Philippe_Ma?= =?utf-8?q?thieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.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é Message-Id: <20201111121234.3246812-2-philmd@redhat.com> Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/ubuntu2004.docker | 1 + 1 file changed, 1 insertion(+) 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 Tue Nov 17 17:36:35 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: 11913051 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0B5561668 for ; Tue, 17 Nov 2020 17:38:27 +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 9E48020678 for ; Tue, 17 Nov 2020 17:38:26 +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="GakcrMpf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9E48020678 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:54226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kf4vx-00046V-ES for patchwork-qemu-devel@patchwork.kernel.org; Tue, 17 Nov 2020 12:38:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59894) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kf4uU-00028O-4r for qemu-devel@nongnu.org; Tue, 17 Nov 2020 12:36:54 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:53360) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kf4uN-0006P9-O1 for qemu-devel@nongnu.org; Tue, 17 Nov 2020 12:36:53 -0500 Received: by mail-wm1-x32a.google.com with SMTP id p22so4050909wmg.3 for ; Tue, 17 Nov 2020 09:36:47 -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=PAJ5aE8N6gr4ejxRSy0yUGc4MSHZiCqHtxPL9qS46IE=; b=GakcrMpfu2Y03WrvTrLgHM6Xo9Htd62RO5bHC5QQ4MGHvCNhCd0/VWcK23ofvqWQGa SO7gVa0FpJgROHcclXN0a/+RJ3SV6nFwxpf0Y8WKy5bITOooqIXziCv1p5SwBBNdqVzr MY8KOnYxQNbwXxRGGDUjbenowmOKzhucm80rbG9k0EJo1Dljla4tUP0Mm6MxmsYRv610 PyCqa9ztO8sGNNt9sxqVXtCH+svN9/IbgtA+7hcsKLu426KdOU1NFpn9Oh9l27WEgcQ7 VS/FjpfvoHnOiLLT8NE2OGNBdbYOXNpEPIjRFQatXNWv8VhRDaYREA46fSj4ysj31mMW Wxvg== 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=PAJ5aE8N6gr4ejxRSy0yUGc4MSHZiCqHtxPL9qS46IE=; b=jx5E7vnWY/CNSe7ZrTQ/OBBZM1ggg8b7fOJpPKJSeygBHNt2qqddS777H1TBDXbjCQ nULjVX8Deyq2HzR5keLj0EaY8/uzqb9sZcsufy7x8sxyj8puH9OpjWMS9haFQ4o6hRZt 7d1/VUZlNsU3CAjc1HlpPtgH7TA4DVFfskfkYCH9m3Q3yuAsb8vde8Xn3h3dPvqtQjmQ 5uoIp7N3+mKaMIA7GVbXGWkzkfstPHGXXUR83zhJ/bIRDZ2MzcjZTQiA7ylEbVjw6/qt m9eTsirZX91A9j+nu5HJG+wNS0LkHFpxDd00p16LaOJMO5b79B2VWE1uduSfEwiJfXEZ tukg== X-Gm-Message-State: AOAM5320gFtV/VdDDUFiUCinw71wcrDBwQC5dNnFxyMxnwVlOmTp1CVg NjPQxQw8EW+2NIpWtTZElIMxEF0B6tHGyQ== X-Google-Smtp-Source: ABdhPJyC1gk8zZqHFtutrs6QcykxW2Na7ezhfy6FAJaGdOA4n99BMraS8WrpqTvTOOKsMuH9bNJH4A== X-Received: by 2002:a1c:4884:: with SMTP id v126mr200447wma.160.1605634606276; Tue, 17 Nov 2020 09:36:46 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v64sm3709314wme.25.2020.11.17.09.36.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 09:36:42 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EDE951FF92; Tue, 17 Nov 2020 17:36:35 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 6/6] gitlab-ci: Move trace backend tests across to gitlab Date: Tue, 17 Nov 2020 17:36:35 +0000 Message-Id: <20201117173635.29101-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201117173635.29101-1-alex.bennee@linaro.org> References: <20201117173635.29101-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-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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 , peter.maydell@linaro.org, Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.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é Message-Id: <20201111121234.3246812-3-philmd@redhat.com> Signed-off-by: Alex Bennée Acked-by: Thomas Huth --- .gitlab-ci.yml | 18 ++++++++++++++++++ .travis.yml | 19 ------------------- 2 files changed, 18 insertions(+), 19 deletions(-) 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