From nobody Sat Nov 23 18:48:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1732208352; cv=none; d=zohomail.com; s=zohoarc; b=jrSFIToGVqPXSa8xvMreJKwhH09ndb3vxMZaRE5Wr/i575b82PxtjIhJjE6ZUVnEUpSbsTEGohu8cheRCLPR815uPU4QnSCjaYHaxO/hAr4uQDyk3IjX1/RUAu1iOWwlMLtfbODAO8B0vD49CWk3wBB/ho6HNYkNBibuQDo6oHQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1732208352; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=yY9M4nXaCJ2neB5ZRMCPvZw3DACi8uIco1VZWqAc51U=; b=kmqzfW8rVTVnrUjKUz8J6mKNmZL7BbeMovFCTW7oM0nVUA1HB1CeEbjBvmtfoCvSOYR2bKXPHztI751SJkZU6tAah2OaXjHRBGgFIg1pmWAjD6hrAvhVl9M1O9tPEbhHIE9cUg1vYIPcwXCagqWlKvd0qP4oiItpikIAstV/y08= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1732208352153338.25233088886216; Thu, 21 Nov 2024 08:59:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tEAVY-0004Wa-Jd; Thu, 21 Nov 2024 11:58:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tEAVT-0004SV-Jz for qemu-devel@nongnu.org; Thu, 21 Nov 2024 11:58:15 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tEAVO-0007yE-VB for qemu-devel@nongnu.org; Thu, 21 Nov 2024 11:58:15 -0500 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4315df7b43fso10078145e9.0 for ; Thu, 21 Nov 2024 08:58:10 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3825fad5f59sm38965f8f.10.2024.11.21.08.58.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 08:58:08 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 9B2825F940; Thu, 21 Nov 2024 16:58:06 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1732208289; x=1732813089; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yY9M4nXaCJ2neB5ZRMCPvZw3DACi8uIco1VZWqAc51U=; b=RVW+Sp+BhRGH1OLGo4Qvw8zhS01M8U8JnIsmK60orhZx5jryg3rXg+00/xiJTAyX3B iV/cjhxcmuhI2Xefv77N/YTy7vgcMx4RKh6Ii3G1mdcEu6n9wLfcz9ZQ25sWhW6/LAMb 7AAAxKRmHTD61LYr+PkHhOkLglqKfBE9/twfj60M+q+abWZnBW5VxiF1uRgFk/2BhI6H ZNXSMjMsHjkqS/++j7XqRxaqkebpc32h/oN6tPW2FBHKNbfJ60Aw2RMPIUiozv3521Oa LD+qNeEN1UP3E6y+RgG14Qj2mpM9PhwDt5M/rcmH9gdvlAhyNKz5iQ1agxm0ulcEqn9/ ec3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732208289; x=1732813089; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yY9M4nXaCJ2neB5ZRMCPvZw3DACi8uIco1VZWqAc51U=; b=VT+Ov0Tk8pentKDLzINmW14+xppslqaKh0GXW4K/2vLxMkyDz3jyPS4/JXBoMRPU25 Y+XlLj78miK2WSnHsGTLS5VZfa4UqKDPkDxnFy5WxwSuvs3pTwH/mADdB33TGkbLMexL BfvOesLw37sF/f37ij5t31XuK6uHP2x2/jLvFBUn4MMe7ObNToIC2QYo+QGG1KGot+XW X60xuXbxBgCcouq4QEvxzVvBXcaQ55Ih/m05hhVQrremyDG3264id6zt7iHB1Dbr97WV dtzGfvxvmsEfmQDLUWqUhAzeDrCMH2v6o7cKv+Nd6S8ipwp1PA1hpd7XtC2RpEqJ5ywG XDBA== X-Gm-Message-State: AOJu0YxDi8t2hYGJURR5RxLhNl4654vih+FoKB7dGmjNKmTCzh16tQL9 PF1x3AvPn9ozidt4q1xKrYSKhXUdKZ6LZyt9wQmls3XoyvNy/b5HuYC3aBD7uA4= X-Gm-Gg: ASbGncvY2lekoTzUAryEXVqQeKyW72UXbFUfVbP4gWpi/0kYtSF93uqfb1l6IFutmzF CZiTcp/p35O2i8g7DFkhor0aboCfj91j7uxkR1/B8uanh3EgpETywVU2LW5GRBGxH+a2XKFMRDC 99I6LBDJpFvdYkqAP87QPF0RvsHHIMnDRxqj1Z9WSpiDDcGCbfRaWfBrB6u6wXTQqDDsmKEkeT/ ly4kdAFRU3ma9yrSip+WsPL0TYk32eTQtzxXVRXg9G95l4L X-Google-Smtp-Source: AGHT+IF8GSqlkmw1CWsVIpaNvgqu6+SlebdLtm04hJzKWCmEWIr+XGtZAqq/ZpdKEt5Zl9EyASIDSg== X-Received: by 2002:a05:6000:2c8:b0:37d:4389:e9de with SMTP id ffacd0b85a97d-38254adecefmr6619313f8f.1.1732208289215; Thu, 21 Nov 2024 08:58:09 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Daniel Henrique Barboza , Pierrick Bouvier , Harsh Prateek Bora , Marcel Apfelbaum , Jiaxun Yang , Halil Pasic , Christian Borntraeger , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Alexandre Iooss , qemu-riscv@nongnu.org, Thomas Huth , Bernhard Beschow , Thomas Huth , Eric Farman , Bin Meng , qemu-s390x@nongnu.org, Niek Linnenbank , qemu-arm@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , John Snow , Wainer dos Santos Moschetta , Cleber Rosa , qemu-rust@nongnu.org, Nicholas Piggin , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Palmer Dabbelt , Markus Armbruster , Weiwei Li , Mahmoud Mandour , Mark Cave-Ayland , Liu Zhiwei , Aurelien Jarno , Ani Sinha , Alistair Francis Subject: [PATCH 02/39] tests/functional: automatically clean up scratch files after tests Date: Thu, 21 Nov 2024 16:57:29 +0000 Message-Id: <20241121165806.476008-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241121165806.476008-1-alex.bennee@linaro.org> References: <20241121165806.476008-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1732208354347116600 From: Daniel P. Berrang=C3=A9 The build/tests/functional subdirectories are consuming huge amounts of disk space. Split the location for scratch files into a 'scratch' sub-directory, separate from log files, and delete it upon completion of each test. The new env variable QEMU_TEST_KEEP_SCRATCH can be set to preserve this scratch dir for debugging access if required. Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Daniel P. Berrang=C3=A9 Message-Id: <20241121154218.1423005-3-berrange@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- docs/devel/testing/functional.rst | 6 ++++++ tests/functional/qemu_test/testcase.py | 14 +++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/docs/devel/testing/functional.rst b/docs/devel/testing/functio= nal.rst index bf6f1bb81e..6b5d0c5b98 100644 --- a/docs/devel/testing/functional.rst +++ b/docs/devel/testing/functional.rst @@ -65,6 +65,12 @@ to the QEMU binary that should be used for the test, for= example:: $ export QEMU_TEST_QEMU_BINARY=3D$PWD/qemu-system-x86_64 $ python3 ../tests/functional/test_file.py =20 +The test framework will automatically purge any scratch files created duri= ng +the tests. If needing to debug a failed test, it is possible to keep these +files around on disk by setting ```QEMU_TEST_KEEP_SCRATCH=3D1``` as an env +variable. Any preserved files will be deleted the next time the test is r= un +without this variable set. + Overview -------- =20 diff --git a/tests/functional/qemu_test/testcase.py b/tests/functional/qemu= _test/testcase.py index 411978b5ef..b9418e2ac0 100644 --- a/tests/functional/qemu_test/testcase.py +++ b/tests/functional/qemu_test/testcase.py @@ -13,8 +13,9 @@ =20 import logging import os -import subprocess import pycotap +import shutil +import subprocess import sys import unittest import uuid @@ -40,11 +41,12 @@ def setUp(self, bin_prefix): self.assertIsNotNone(self.qemu_bin, 'QEMU_TEST_QEMU_BINARY must be= set') self.arch =3D self.qemu_bin.split('-')[-1] =20 - self.workdir =3D os.path.join(BUILD_DIR, 'tests/functional', self.= arch, - self.id()) + self.outputdir =3D os.path.join(BUILD_DIR, 'tests', 'functional', + self.arch, self.id()) + self.workdir =3D os.path.join(self.outputdir, 'scratch') os.makedirs(self.workdir, exist_ok=3DTrue) =20 - self.logdir =3D self.workdir + self.logdir =3D self.outputdir self.log_filename =3D os.path.join(self.logdir, 'base.log') self.log =3D logging.getLogger('qemu-test') self.log.setLevel(logging.DEBUG) @@ -56,6 +58,8 @@ def setUp(self, bin_prefix): self.log.addHandler(self._log_fh) =20 def tearDown(self): + if "QEMU_TEST_KEEP_SCRATCH" not in os.environ: + shutil.rmtree(self.workdir) self.log.removeHandler(self._log_fh) =20 def main(): @@ -108,7 +112,7 @@ def setUp(self): =20 console_log =3D logging.getLogger('console') console_log.setLevel(logging.DEBUG) - self.console_log_name =3D os.path.join(self.workdir, 'console.log') + self.console_log_name =3D os.path.join(self.logdir, 'console.log') self._console_log_fh =3D logging.FileHandler(self.console_log_name, mode=3D'w') self._console_log_fh.setLevel(logging.DEBUG) --=20 2.39.5