From patchwork Tue Feb 28 19:06:45 2023 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: 657485 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3097809wrb; Tue, 28 Feb 2023 11:10:21 -0800 (PST) X-Google-Smtp-Source: AK7set9MJQR681niQ5JzygRJ5JCSpV+wc2e4uMb4PJIeHGq+FCu4mazrN1yTz1o8ZU5xJj0Ae4Ch X-Received: by 2002:a05:6214:cac:b0:572:60e4:b6ba with SMTP id s12-20020a0562140cac00b0057260e4b6bamr8129674qvs.32.1677611421138; Tue, 28 Feb 2023 11:10:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677611421; cv=none; d=google.com; s=arc-20160816; b=hLNdZoEkRTZ8Tt4C/Yuk109V1DY04OOx6J5SOKKKTiTTk/U/sm1DxovtPSTshcK414 2Ap21pCyzQj3TFwLxBDFojOORCP9Ief3KEz4HshB2pOiZxZGhE63Ia9zHxiIK/WDkCxf f1rDPTkP9LLPDDNd7Ck2Wc55qbG/fULxQuYtZE41C6LJlzDtfMvdMp6zGWK+L+l+TUBw +tD+rjz3tZs8s//xHzkBU1UEir9DuHLd8BOm4dRAi8KD6zZ6DruJFZC/1/dD3+fNgbsi d+TquRjqP428WgcZcSQgUvGZhLH2kDivMNd5o+RQlqeGP6HvQ8twxmdZMrge6RGj39+Y UdIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=thQrLXkRWue5/igRIQt+F6mSv/9xFmIxivOvyRTxMxg=; b=wYLU0DqQZcbSKSbYDQNFuz728lI1fIjpt8ANj+2/bQQQ1mTWWWEf3nu3xxMEOJuwQK brQAwEhXXAYb2aovnzoVSoANnhIu2n8YduKs3Sv+10O7xVgc5JZO/ZetjC3QtpNP8XSP yv8w9zyPt8gYBMRL5u8FeqLaxu5KoskIdNhkI4NB5y8MGDijayuJT4o8NFr093By/sq4 wroUQSWjexskDRtqC6GNEEyK530nzq2hbrXaLm3ws6c1akTgEsqA9ze3u/6fkGyoBG6a 891CaqH3QQ+m+w0krEeeYdbVWaCeEcbgJU+eSo833AfY76MxaVciXA8Dz8T4hF4p+qP1 Cbhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=U+QeD1e9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m20-20020a05620a24d400b0073b22c17aa9si9778202qkn.698.2023.02.28.11.10.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 11:10:21 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=U+QeD1e9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pX5K5-0002PF-QK; Tue, 28 Feb 2023 14:07:37 -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 1pX5Jp-0002Lh-Oh for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:24 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX5Jk-0002ms-0O for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:21 -0500 Received: by mail-wm1-x32b.google.com with SMTP id j19-20020a05600c1c1300b003e9b564fae9so10325206wms.2 for ; Tue, 28 Feb 2023 11:07:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=thQrLXkRWue5/igRIQt+F6mSv/9xFmIxivOvyRTxMxg=; b=U+QeD1e9dYZV4RFaSK44k7dSd7yYjes2Nc9PEXHkIYldfLiDMa4iiJgeHD7Qmt1wFr HU3PvdgTdQ/1f3p+eVDPqrQePC2VbsYj8ZS5mjrikFWWSC6aamEU3BRdbXbcZbFahMTo 5Py8oXa16gSrkYu3HJ9Re5GllBU2VdgKH3kOHK82yS6X97fQzPV7q4/SbXGGwKJ0AKUg fi9VInFJx5uI/+jUQRgiZSmvQAz6KNo2Y1UlP6VUzX9Wq9xBxOY7jR2wXPGYijk0Q5LL blP0mKQgsuR1zTJ94wCA4vJZkj1kY8Cur2SqxKzM2NR3RZVVZc/aKvbiJqASDrCji/m5 3Gcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=thQrLXkRWue5/igRIQt+F6mSv/9xFmIxivOvyRTxMxg=; b=Tcm1TTKxKhyIBlAiFGtRVt+UPJLX18I5W70ySoGSssnIhQyBoApFXOliSr4pboSTD8 9eWP41MuFk9RW3KXxk4krviwEkCrBsF+8Wu3CBHlaZH9YHp/6nCijHOwXNwEDJJhdNxK 10WQPkCeUA74UXsapC/RnmwYT4+6w0TCIXqEzfoGshblMw8XDxmW4HuUECJPlDsSrmRo zr+GvTY/gRUOuaeABIQBfnAyAM4Ir1i5H1zC743Fi2ogrigWycQBQuZbngCMEFzl+VRx ILoXX98CeLRDxQ/XWCKmntFmkZg3DqyqpYB97wjyw7q9oti5BReCIXEGiLefbsk+tWGb imGA== X-Gm-Message-State: AO0yUKUoqazTLkuIii2CTiEh55ymzqMvDzX9isJGHRLikmvLvAFPVYVq trjN2z+P2w+sGCk8JM3vFXAAJA== X-Received: by 2002:a05:600c:1992:b0:3ea:f0d6:5d36 with SMTP id t18-20020a05600c199200b003eaf0d65d36mr3057445wmq.29.1677611223084; Tue, 28 Feb 2023 11:07:03 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a5-20020a5d4565000000b002c3f81c51b6sm10358330wrc.90.2023.02.28.11.06.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 11:07:01 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1FA811FFBB; Tue, 28 Feb 2023 19:06:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Michael Roth , Peter Maydell , Kevin Wolf , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Alexander Bulekov , Aurelien Jarno , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Darren Kenny , Hanna Reitz , Cleber Rosa , John Snow , Ed Maste , qemu-arm@nongnu.org, Fam Zheng , Thomas Huth , Yonggang Luo , qemu-block@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , Bandan Das , Li-Wen Hsu , Pavel Dovgalyuk , Laurent Vivier , Bastian Koppelmann , Qiuhao Li , Wainer dos Santos Moschetta , "Richard W.M. Jones" Subject: [PATCH v3 16/24] tests: Ensure TAP version is printed before other messages Date: Tue, 28 Feb 2023 19:06:45 +0000 Message-Id: <20230228190653.1602033-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org> References: <20230228190653.1602033-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: "Richard W.M. Jones" These two tests were failing with this error: stderr: TAP parsing error: version number must be on the first line [...] Unknown TAP version. The first line MUST be `TAP version `. Assuming version 12. This can be fixed by ensuring we always call g_test_init first in the body of main. Thanks: Daniel Berrange, for diagnosing the problem Signed-off-by: Richard W.M. Jones Reviewed-by: Daniel P. Berrangé Tested-by: Philippe Mathieu-Daudé Reviewed-by: Alexander Bulekov Reviewed-by: Darren Kenny Message-Id: <20230227174019.1164205-1-rjones@redhat.com> Signed-off-by: Alex Bennée --- tests/qtest/fuzz-lsi53c895a-test.c | 4 ++-- tests/qtest/rtl8139-test.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/qtest/fuzz-lsi53c895a-test.c b/tests/qtest/fuzz-lsi53c895a-test.c index a9254b455d..2012bd54b7 100644 --- a/tests/qtest/fuzz-lsi53c895a-test.c +++ b/tests/qtest/fuzz-lsi53c895a-test.c @@ -112,12 +112,12 @@ static void test_lsi_do_dma_empty_queue(void) int main(int argc, char **argv) { + g_test_init(&argc, &argv, NULL); + if (!qtest_has_device("lsi53c895a")) { return 0; } - g_test_init(&argc, &argv, NULL); - qtest_add_func("fuzz/lsi53c895a/lsi_do_dma_empty_queue", test_lsi_do_dma_empty_queue); diff --git a/tests/qtest/rtl8139-test.c b/tests/qtest/rtl8139-test.c index 1beb83805c..4bd240e9ee 100644 --- a/tests/qtest/rtl8139-test.c +++ b/tests/qtest/rtl8139-test.c @@ -207,9 +207,10 @@ int main(int argc, char **argv) verbosity_level = atoi(v_env); } + g_test_init(&argc, &argv, NULL); + qtest_start("-device rtl8139"); - g_test_init(&argc, &argv, NULL); qtest_add_func("/rtl8139/nop", nop); qtest_add_func("/rtl8139/timer", test_init);