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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4060FC433F5 for ; Tue, 16 Nov 2021 14:09:12 +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 B31A160F9C for ; Tue, 16 Nov 2021 14:09:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B31A160F9C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:40364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mmz94-0002bH-ML for qemu-devel@archiver.kernel.org; Tue, 16 Nov 2021 09:09:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45766) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mmz7f-0001uX-6L for qemu-devel@nongnu.org; Tue, 16 Nov 2021 09:07:43 -0500 Received: from szxga03-in.huawei.com ([45.249.212.189]:3201) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mmz7b-0000ZB-Nx for qemu-devel@nongnu.org; Tue, 16 Nov 2021 09:07:42 -0500 Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.53]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4Htns16bXZz8vQ7; Tue, 16 Nov 2021 22:05:41 +0800 (CST) Received: from dggpemm500023.china.huawei.com (7.185.36.83) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Tue, 16 Nov 2021 22:07:24 +0800 Received: from [10.174.187.128] (10.174.187.128) by dggpemm500023.china.huawei.com (7.185.36.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2308.20; Tue, 16 Nov 2021 22:07:22 +0800 Subject: Re: [PATCH-for-7.0 v4 05/11] tests/unit/test-smp-parse: Split the 'generic' test in valid / invalid To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , References: <20211115145900.2531865-1-philmd@redhat.com> <20211115145900.2531865-6-philmd@redhat.com> From: "wangyanan (Y)" Message-ID: <0d3fa53c-ae1f-abfe-1418-46f96ca75015@huawei.com> Date: Tue, 16 Nov 2021 22:07:21 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: <20211115145900.2531865-6-philmd@redhat.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-Originating-IP: [10.174.187.128] X-ClientProxiedBy: dggeme711-chm.china.huawei.com (10.1.199.107) To dggpemm500023.china.huawei.com (7.185.36.83) X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.189; envelope-from=wangyanan55@huawei.com; helo=szxga03-in.huawei.com X-Spam_score_int: -55 X-Spam_score: -5.6 X-Spam_bar: ----- X-Spam_report: (-5.6 / 5.0 requ) BAYES_00=-1.9, NICE_REPLY_A=-1.446, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Andrew Jones , Markus Armbruster , Eduardo Habkost Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 2021/11/15 22:58, Philippe Mathieu-Daudé wrote: > Split the 'generic' test in two tests: 'valid' and 'invalid'. > This will allow us to remove the hack which modifies the > MachineClass internal state. > > Signed-off-by: Philippe Mathieu-Daudé > --- > tests/unit/test-smp-parse.c | 22 +++++++++++++++++++--- > 1 file changed, 19 insertions(+), 3 deletions(-) > > diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c > index 37c6b4981db..e27aedad354 100644 > --- a/tests/unit/test-smp-parse.c > +++ b/tests/unit/test-smp-parse.c > @@ -487,7 +487,7 @@ static void machine_base_class_init(ObjectClass *oc, void *data) > mc->name = g_strdup(SMP_MACHINE_NAME); > } > > -static void test_generic(const void *opaque) > +static void test_generic_valid(const void *opaque) > { > const char *machine_type = opaque; > Object *obj = object_new(machine_type); > @@ -508,6 +508,19 @@ static void test_generic(const void *opaque) > smp_parse_test(ms, data, true); > } > > + object_unref(obj); > +} > + > +static void test_generic_invalid(const void *opaque) > +{ > + const char *machine_type = opaque; > + Object *obj = object_new(machine_type); > + MachineState *ms = MACHINE(obj); > + MachineClass *mc = MACHINE_GET_CLASS(obj); > + SMPTestData *data = &(SMPTestData){}; > + int i; > + > + Ah, there is an extra empty line which should be deleted. Thanks, Yanan > /* Force invalid min CPUs and max CPUs */ > mc->min_cpus = 2; > mc->max_cpus = 511; > @@ -601,9 +614,12 @@ int main(int argc, char *argv[]) > > g_test_init(&argc, &argv, NULL); > > - g_test_add_data_func("/test-smp-parse/generic", > + g_test_add_data_func("/test-smp-parse/generic/valid", > TYPE_MACHINE, > - test_generic); > + test_generic_valid); > + g_test_add_data_func("/test-smp-parse/generic/invalid", > + TYPE_MACHINE, > + test_generic_invalid); > g_test_add_data_func("/test-smp-parse/with_dies", > TYPE_MACHINE, > test_with_dies);