From nobody Mon Feb 9 08:19:40 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1644329737098402.2826138408809; Tue, 8 Feb 2022 06:15:37 -0800 (PST) Received: from localhost ([::1]:40554 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHRHM-0006Xs-0B for importer@patchew.org; Tue, 08 Feb 2022 09:15:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50120) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHPt0-00013v-HZ for qemu-devel@nongnu.org; Tue, 08 Feb 2022 07:46:29 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:50677) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHPrU-0004xT-D0 for qemu-devel@nongnu.org; Tue, 08 Feb 2022 07:44:50 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-543-6oPhbwx_NTKo4MbBmWFAig-1; Tue, 08 Feb 2022 07:44:35 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A1BAD8143E5; Tue, 8 Feb 2022 12:44:34 +0000 (UTC) Received: from virtlab511.virt.lab.eng.bos.redhat.com (virtlab511.virt.lab.eng.bos.redhat.com [10.19.152.198]) by smtp.corp.redhat.com (Postfix) with ESMTP id 745B72B47B; Tue, 8 Feb 2022 12:44:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1644324277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jY1G46jaslXetJ4Arwk3mIXfn43fuCWQjQ0QEpqvj0w=; b=hSefxUFxkH/+EI6951GYb5GAuqaSQgpWXFQnApBEf9mzOBqDcOUKyzyskoBdYt2xzHFHiY 3xssI33vvnr6+db83pBOfitGh8jgZx2u5xZaSyMVVRakJCLf993P5qJtWKs1IZYghYcl6/ YnL7TpfjZKJqTJoDKQjDWYz3ifEPM0g= X-MC-Unique: 6oPhbwx_NTKo4MbBmWFAig-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH] Revert "check-block: replace -makecheck with TAP output" Date: Tue, 8 Feb 2022 07:44:32 -0500 Message-Id: <20220208124432.84924-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Cc: Peter Maydell , thuth@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1644329739116100001 Content-Type: text/plain; charset="utf-8" This reverts commit d316859f4e28c74ab8b618895d2a5e0a865d3cf1. The TAP output is inferior in that it does not include the diff for failed tests. Reported-by: Peter Maydell Signed-off-by: Paolo Bonzini Tested-by: Peter Maydell --- tests/check-block.sh | 6 ++-- tests/qemu-iotests/check | 6 ++-- tests/qemu-iotests/meson.build | 1 - tests/qemu-iotests/testenv.py | 30 +++++++++---------- tests/qemu-iotests/testrunner.py | 49 +++++++++++++++----------------- 5 files changed, 44 insertions(+), 48 deletions(-) diff --git a/tests/check-block.sh b/tests/check-block.sh index 720a46bc36..88e02453d2 100755 --- a/tests/check-block.sh +++ b/tests/check-block.sh @@ -14,8 +14,8 @@ else fi =20 skip() { - echo "1..0 #SKIP $*" - exit 0 + echo "$*" + exit 77 } =20 if grep -q "CONFIG_GPROF=3Dy" config-host.mak 2>/dev/null ; then @@ -79,7 +79,7 @@ JOBS=3D$(echo "$MAKEFLAGS" | sed -n 's/\(^\|.* \)-j\([0-9= ]\+\)\( .*\|$\)/-j \2/p') =20 ret=3D0 for fmt in $format_list ; do - ${PYTHON} ./check $JOBS -tap -$fmt $group || ret=3D1 + ${PYTHON} ./check $JOBS -makecheck -$fmt $group || ret=3D1 done =20 exit $ret diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index 75de1b4691..0c27721a41 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -32,6 +32,8 @@ def make_argparser() -> argparse.ArgumentParser: =20 p.add_argument('-n', '--dry-run', action=3D'store_true', help=3D'show me, do not run tests') + p.add_argument('-makecheck', action=3D'store_true', + help=3D'pretty print output for make check') p.add_argument('-j', dest=3D'jobs', type=3Dint, default=3D1, help=3D'run tests in multiple parallel jobs') =20 @@ -51,8 +53,6 @@ def make_argparser() -> argparse.ArgumentParser: p.add_argument('--color', choices=3D['on', 'off', 'auto'], default=3D'auto', help=3D"use terminal colors. The defa= ult " "'auto' value means use colors if terminal stdout detec= ted") - p.add_argument('-tap', action=3D'store_true', - help=3D'produce TAP output') =20 g_env =3D p.add_argument_group('test environment options') mg =3D g_env.add_mutually_exclusive_group() @@ -164,7 +164,7 @@ if __name__ =3D=3D '__main__': if args.dry_run: print('\n'.join(tests)) else: - with TestRunner(env, tap=3Dargs.tap, + with TestRunner(env, makecheck=3Dargs.makecheck, color=3Dargs.color) as tr: paths =3D [os.path.join(env.source_iotests, t) for t in tests] ok =3D tr.run_tests(paths, args.jobs) diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build index 5be3c74127..3a9425d15c 100644 --- a/tests/qemu-iotests/meson.build +++ b/tests/qemu-iotests/meson.build @@ -22,7 +22,6 @@ if have_tools and targetos !=3D 'windows' endif test('qemu-iotests ' + format, sh, args: [files('../check-block.sh'), = format], depends: qemu_iotests_binaries, env: qemu_iotests_env, - protocol: 'tap', suite: suites, timeout: 0, is_parallel: false) diff --git a/tests/qemu-iotests/testenv.py b/tests/qemu-iotests/testenv.py index 0f32897fe8..c33454fa68 100644 --- a/tests/qemu-iotests/testenv.py +++ b/tests/qemu-iotests/testenv.py @@ -287,21 +287,21 @@ def __enter__(self) -> 'TestEnv': def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> N= one: self.close() =20 - def print_env(self, prefix: str =3D '') -> None: + def print_env(self) -> None: template =3D """\ -{prefix}QEMU -- "{QEMU_PROG}" {QEMU_OPTIONS} -{prefix}QEMU_IMG -- "{QEMU_IMG_PROG}" {QEMU_IMG_OPTIONS} -{prefix}QEMU_IO -- "{QEMU_IO_PROG}" {QEMU_IO_OPTIONS} -{prefix}QEMU_NBD -- "{QEMU_NBD_PROG}" {QEMU_NBD_OPTIONS} -{prefix}IMGFMT -- {IMGFMT}{imgopts} -{prefix}IMGPROTO -- {IMGPROTO} -{prefix}PLATFORM -- {platform} -{prefix}TEST_DIR -- {TEST_DIR} -{prefix}SOCK_DIR -- {SOCK_DIR} -{prefix}GDB_OPTIONS -- {GDB_OPTIONS} -{prefix}VALGRIND_QEMU -- {VALGRIND_QEMU} -{prefix}PRINT_QEMU_OUTPUT -- {PRINT_QEMU} -{prefix}""" +QEMU -- "{QEMU_PROG}" {QEMU_OPTIONS} +QEMU_IMG -- "{QEMU_IMG_PROG}" {QEMU_IMG_OPTIONS} +QEMU_IO -- "{QEMU_IO_PROG}" {QEMU_IO_OPTIONS} +QEMU_NBD -- "{QEMU_NBD_PROG}" {QEMU_NBD_OPTIONS} +IMGFMT -- {IMGFMT}{imgopts} +IMGPROTO -- {IMGPROTO} +PLATFORM -- {platform} +TEST_DIR -- {TEST_DIR} +SOCK_DIR -- {SOCK_DIR} +GDB_OPTIONS -- {GDB_OPTIONS} +VALGRIND_QEMU -- {VALGRIND_QEMU} +PRINT_QEMU_OUTPUT -- {PRINT_QEMU} +""" =20 args =3D collections.defaultdict(str, self.get_env()) =20 @@ -310,5 +310,5 @@ def print_env(self, prefix: str =3D '') -> None: =20 u =3D os.uname() args['platform'] =3D f'{u.sysname}/{u.machine} {u.nodename} {u.rel= ease}' - args['prefix'] =3D prefix + print(template.format_map(args)) diff --git a/tests/qemu-iotests/testrunner.py b/tests/qemu-iotests/testrunn= er.py index 0eace147b8..15788f919e 100644 --- a/tests/qemu-iotests/testrunner.py +++ b/tests/qemu-iotests/testrunner.py @@ -152,10 +152,10 @@ def run_tests_pool(self, tests: List[str], =20 return results =20 - def __init__(self, env: TestEnv, tap: bool =3D False, + def __init__(self, env: TestEnv, makecheck: bool =3D False, color: str =3D 'auto') -> None: self.env =3D env - self.tap =3D tap + self.makecheck =3D makecheck self.last_elapsed =3D LastElapsedTime('.last-elapsed-cache', env) =20 assert color in ('auto', 'on', 'off') @@ -185,16 +185,13 @@ def test_print_one_line(self, test: str, """ Print short test info before/after test run """ test =3D os.path.basename(test) =20 - if test_field_width is None: - test_field_width =3D 8 + if self.makecheck and status !=3D '...': + if status and status !=3D 'pass': + status =3D f' [{status}]' + else: + status =3D '' =20 - if self.tap: - if status =3D=3D 'pass': - print(f'ok {self.env.imgfmt} {test}') - elif status =3D=3D 'fail': - print(f'not ok {self.env.imgfmt} {test}') - elif status =3D=3D 'not run': - print(f'ok {self.env.imgfmt} {test} # SKIP') + print(f' TEST iotest-{self.env.imgfmt}: {test}{status}') return =20 if lasttime: @@ -346,7 +343,7 @@ def run_test(self, test: str, last_el =3D self.last_elapsed.get(test) start =3D datetime.datetime.now().strftime('%H:%M:%S') =20 - if not self.tap: + if not self.makecheck: self.test_print_one_line(test=3Dtest, test_field_width=3Dtest_field_width, status =3D 'started' if mp else '...', @@ -375,9 +372,7 @@ def run_tests(self, tests: List[str], jobs: int =3D 1) = -> bool: notrun =3D [] casenotrun =3D [] =20 - if self.tap: - self.env.print_env('# ') - else: + if not self.makecheck: self.env.print_env() =20 test_field_width =3D max(len(os.path.basename(t)) for t in tests) = + 2 @@ -403,6 +398,8 @@ def run_tests(self, tests: List[str], jobs: int =3D 1) = -> bool: =20 if res.status =3D=3D 'fail': failed.append(name) + if self.makecheck: + self.env.print_env() if res.diff: print('\n'.join(res.diff)) elif res.status =3D=3D 'not run': @@ -415,16 +412,16 @@ def run_tests(self, tests: List[str], jobs: int =3D 1= ) -> bool: if res.interrupted: break =20 - if not self.tap: - if notrun: - print('Not run:', ' '.join(notrun)) + if notrun: + print('Not run:', ' '.join(notrun)) =20 - if casenotrun: - print('Some cases not run in:', ' '.join(casenotrun)) + if casenotrun: + print('Some cases not run in:', ' '.join(casenotrun)) =20 - if failed: - print('Failures:', ' '.join(failed)) - print(f'Failed {len(failed)} of {n_run} iotests') - else: - print(f'Passed all {n_run} iotests') - return not failed + if failed: + print('Failures:', ' '.join(failed)) + print(f'Failed {len(failed)} of {n_run} iotests') + return False + else: + print(f'Passed all {n_run} iotests') + return True --=20 2.31.1