From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id C2A22CEE343 for ; Tue, 18 Nov 2025 18:39:57 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vLQcC-0002O3-RV; Tue, 18 Nov 2025 13:39:46 -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 1vLQc6-0002MV-0B for qemu-devel@nongnu.org; Tue, 18 Nov 2025 13:39:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vLQbv-0002i2-CY for qemu-devel@nongnu.org; Tue, 18 Nov 2025 13:39:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763491162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=FFeALmQ/G2B3bP7Q+9hrnPgM1nbF3dq/8337TAP/l9c=; b=U/ty73/t0Zqfa6E32BpGyHZ7btGEhA9Xfwq+A+7bJWEEHJzp3K6ZVEVxSJ8Iwucps+LC4h Nu9VOHf6ZKjZYvhVVdoIt/3MAQCpa6DCAv/wFy7psXaKNpTA7OjsCfxYgJutrekUX7Jy8J YsJpDeTUggjuz9y0AB0+PQ/LgOW/VL8= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-269-L1YikT8uPpmJDObiINZe-A-1; Tue, 18 Nov 2025 13:39:19 -0500 X-MC-Unique: L1YikT8uPpmJDObiINZe-A-1 X-Mimecast-MFC-AGG-ID: L1YikT8uPpmJDObiINZe-A_1763491158 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 249A9191B4C5; Tue, 18 Nov 2025 18:39:18 +0000 (UTC) Received: from localhost (unknown [10.2.17.122]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4B2BD19540DF; Tue, 18 Nov 2025 18:39:16 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Mads Ynddal , berrange@redhat.com, Stefan Hajnoczi Subject: [PATCH] tracetool-test: add QEMU_TEST_KEEP_SCRATCH=1 support Date: Tue, 18 Nov 2025 13:39:15 -0500 Message-ID: <20251118183915.177192-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass client-ip=170.10.129.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org It can be useful to preserve the temporary files generated by the test for manual inspection or diffing against expected output. Signed-off-by: Stefan Hajnoczi --- tests/tracetool/tracetool-test.py | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/tests/tracetool/tracetool-test.py b/tests/tracetool/tracetool-test.py index 786083ad7f..5a0c6a869c 100755 --- a/tests/tracetool/tracetool-test.py +++ b/tests/tracetool/tracetool-test.py @@ -9,6 +9,9 @@ import tempfile +DELETE_TEMPFILE = not os.getenv("QEMU_TEST_KEEP_SCRATCH", False) + + def get_formats(backend): formats = [ "c", @@ -49,7 +52,8 @@ def test_tracetool_one(tracetool, backend, fmt, src_dir, build_dir): check_call(args, cwd=build_dir) actual = actual_file.read_text() finally: - actual_file.unlink() + if DELETE_TEMPFILE: + actual_file.unlink() if os.getenv("QEMU_TEST_REGENERATE", False): print(f"# regenerate {expect_file}") @@ -84,14 +88,25 @@ def test_tracetool(tracetool, backend, source_dir, build_dir): except Exception as e: print(f"# {e}") fail = True + + if DELETE_TEMPFILE: + tempfile_hint = ( + "QEMU_TEST_KEEP_SCRATCH=1 to preserve test output " + + "files" + ) + else: + tempfile_hint = f"check test output files in {build_dir}" + hint = ( " (set QEMU_TEST_REGENERATE=1 to recreate reference " - + "output if tracetool generator was intentionally changed)" + + "output if tracetool generator was intentionally " + + "changed or " + tempfile_hint + ")" ) finally: print(f"{status} {num} - {backend}.{fmt}{hint}") finally: - build_events.unlink() + if DELETE_TEMPFILE: + build_events.unlink() return fail @@ -102,7 +117,8 @@ def test_tracetool(tracetool, backend, source_dir, build_dir): print("syntax: {argv0} TRACE-TOOL BACKEND SRC-DIR BUILD-DIR", file=sys.stderr) sys.exit(1) - with tempfile.TemporaryDirectory(prefix=sys.argv[4]) as tmpdir: + with tempfile.TemporaryDirectory(prefix=sys.argv[4], + delete=DELETE_TEMPFILE) as tmpdir: fail = test_tracetool(sys.argv[1], sys.argv[2], sys.argv[3], tmpdir) if fail: sys.exit(1) -- 2.51.1