From nobody Wed May 15 22:38:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+48680+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+48680+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1570674254; cv=none; d=zoho.com; s=zohoarc; b=Wlj+0LCbfU7KuA7MDWVps7rgRe6z34qP1QCWX1SN+X5/UVEmnLiOtxOFL6Ip/XphXCEaAzJbbZw2QZF3XsBGeiOmJ+TiBokJ3/p4PKTWWZgjYz4hKo5kun5OLQZee92tsqWG704T8MzDVI+0ET3C0SMInwMN4W6kxL2xdVn/FYs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570674254; h=Cc:Date:From:List-Id:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To; bh=ggenp4AcFnmjH59MJcVeSFK54ygF4QDXCFF0+SMSKQ4=; b=HsJiZn253K1AfUbIKk2ps3euT5zJNAFJvWS3jQ+2ignpEfb100LZAVwQou2PN58cNmuaWPx2Z6Vb1t6wTmWHxGQh/3oEMOAgmpkHpDErMq0hwzOrBzvylmQe5y0LV0c+m3t775flhRufHYOqb9u99KDpHCZmg8Wilk6NS0kX5DM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+48680+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 157067425425522.7846984429101; Wed, 9 Oct 2019 19:24:14 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id prsBYY1788612xySrYisqTgU; Wed, 09 Oct 2019 19:24:13 -0700 X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web11.1456.1570674253348961980 for ; Wed, 09 Oct 2019 19:24:13 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Oct 2019 19:24:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,278,1566889200"; d="scan'208";a="187812543" X-Received: from xianhu2x-mobl.ccr.corp.intel.com ([10.239.196.134]) by orsmga008.jf.intel.com with ESMTP; 09 Oct 2019 19:24:11 -0700 From: "xianhui liu" To: devel@edk2.groups.io Cc: Heinrich Schuchardt , Supreeth Venkatesh , Eric Jin , xianhui liu Subject: [edk2-devel] [edk2-test][Patch v2] uefi-sct/SctPkg: Sync SNP Statistics change to IHV Date: Thu, 10 Oct 2019 10:24:09 +0800 Message-Id: <20191010022409.6540-1-xianhuix.liu@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,xianhuix.liu@intel.com X-Gm-Message-State: KB7QzkDzyTgCb5PuCNQRlwzBx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1570674253; bh=tXkjnnanzuVK8xcxS67z1af1rSftYDUmN8WhpK9+SoU=; h=Cc:Date:From:Reply-To:Subject:To; b=hW15EmAO+FeE/1+NxA5UrQNsH9jdVb8yb+uWRkcCZO9GkkL2u0i3T1oyBsCM4+IzFU+ ddcpC2VEsR3jRmWipsi2f/d7mciHFxnysfxCQj1EcC1emqyiUp3yhKvu5gVjfPfRvalm9 CTfejFwg0RXGxb/mw6lJ9IhP71HbHnge7iw= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2160 sync commit 269f8a35e44f2093625b3671f372f68e2983c49d on file EFI/Protocol/SimpleNetwork/BlackBoxTest /SimpleNetworkBBTestConformance.c to IHV Cc: Heinrich Schuchardt Cc: Supreeth Venkatesh Cc: Eric Jin Signed-off-by: xianhui liu Reviewed-by: Eric Jin --- .../BlackBoxTest/SimpleNetworkBBTestConformance.c | 125 ++++++++++++-----= ---- 1 file changed, 73 insertions(+), 52 deletions(-) diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleNetwork/Black= BoxTest/SimpleNetworkBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/IH= V/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestConformance.c index 9d5bec18..c758f560 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleNetwork/BlackBoxTest= /SimpleNetworkBBTestConformance.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleNetwork/BlackBoxTest= /SimpleNetworkBBTestConformance.c @@ -1,7 +1,7 @@ /** @file =20 Copyright 2006 - 2016 Unified EFI, Inc.
- Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
+ Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License @@ -964,8 +964,7 @@ BBTestStatisticsConformanceTest ( { EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib; EFI_STATUS Status; - EFI_STATUS StatusBuf[3]; =20 - EFI_TEST_ASSERTION AssertionType[3]; + EFI_TEST_ASSERTION AssertionType; EFI_SIMPLE_NETWORK_PROTOCOL *SnpInterface; EFI_SIMPLE_NETWORK_STATE State1, State2; EFI_NETWORK_STATISTICS StatisticsTable; @@ -1012,31 +1011,68 @@ BBTestStatisticsConformanceTest ( StatisticsSize =3D sizeof (EFI_NETWORK_STATISTICS); // // Assertion Point 5.8.2.1 - // Call Statistics() function if network interface not start. + // Call Statistics() function while network interface is not started. // - StatusBuf[0] =3D SnpInterface->Statistics (SnpInterface, FALSE, &Statist= icsSize, &StatisticsTable); - if ((StatusBuf[0] =3D=3D EFI_NOT_STARTED) && (SnpInterface->Mode->State = =3D=3D EfiSimpleNetworkStopped)) { - AssertionType[0] =3D EFI_TEST_ASSERTION_PASSED; + Status =3D SnpInterface->Statistics (SnpInterface, FALSE, &StatisticsSiz= e, &StatisticsTable); + if (Status =3D=3D EFI_UNSUPPORTED) { + StandardLib->RecordMessage( + StandardLib, + EFI_VERBOSE_LEVEL_QUIET, + L"Statistics isn't supported, Status - %r\n", + Status + ); } else { - AssertionType[0] =3D EFI_TEST_ASSERTION_FAILED; + if ((Status =3D=3D EFI_NOT_STARTED) && (SnpInterface->Mode->State =3D= =3D EfiSimpleNetworkStopped)) { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } + StandardLib->RecordAssertion ( + StandardLib, + AssertionType, + gSimpleNetworkBBTestConformanceAssertionGuid014, + L"EFI_SIMPLE_NETWORK_PROTOCOL.Statistics - Invoke Stati= stics() while network interface not started.", + L"%a:%d:Status - %r", + __FILE__, + (UINTN)__LINE__, + Status + ); } =20 // // Assertion Point 5.8.2.2 - // Call Statistics() function if network interface not initialized. + // Call Statistics() function while network interface is not initialized. // Status =3D SnpInterface->Start (SnpInterface); if (EFI_ERROR(Status)) { return Status; } =20 - StatusBuf[1] =3D SnpInterface->Statistics (SnpInterface, FALSE, &Statist= icsSize, &StatisticsTable); - if (StatusBuf[1] =3D=3D EFI_DEVICE_ERROR) { - AssertionType[1] =3D EFI_TEST_ASSERTION_PASSED; + Status =3D SnpInterface->Statistics (SnpInterface, FALSE, &StatisticsSiz= e, &StatisticsTable); + if (Status =3D=3D EFI_UNSUPPORTED) { + StandardLib->RecordMessage( + StandardLib, + EFI_VERBOSE_LEVEL_QUIET, + L"Statistics isn't supported, Status - %r\n", + Status + ); } else { - AssertionType[1] =3D EFI_TEST_ASSERTION_FAILED; + if (Status =3D=3D EFI_DEVICE_ERROR) { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } + StandardLib->RecordAssertion ( + StandardLib, + AssertionType, + gSimpleNetworkBBTestConformanceAssertionGuid015, + L"EFI_SIMPLE_NETWORK_PROTOCOL.Statistics - Invoke Stati= stics() while network interface is not initialized.", + L"%a:%d:Status - %r", + __FILE__, + (UINTN)__LINE__, + Status + ); } -=20 =20 // // Assertion Point 5.8.2.3 @@ -1053,47 +1089,32 @@ BBTestStatisticsConformanceTest ( // StatisticsSize =3D 0; =20 - StatusBuf[2] =3D SnpInterface->Statistics (SnpInterface, FALSE, &Statist= icsSize, &StatisticsTable); - if (StatusBuf[2] =3D=3D EFI_BUFFER_TOO_SMALL || Status =3D=3D EFI_UNSUPP= ORTED) { - AssertionType[2] =3D EFI_TEST_ASSERTION_PASSED; + Status =3D SnpInterface->Statistics (SnpInterface, FALSE, &StatisticsSiz= e, &StatisticsTable); + if (Status =3D=3D EFI_UNSUPPORTED) { + StandardLib->RecordMessage( + StandardLib, + EFI_VERBOSE_LEVEL_QUIET, + L"Statistics isn't supported, Status - %r\n", + Status + ); } else { - AssertionType[2] =3D EFI_TEST_ASSERTION_FAILED; + if (Status =3D=3D EFI_BUFFER_TOO_SMALL) { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } + StandardLib->RecordAssertion ( + StandardLib, + AssertionType, + gSimpleNetworkBBTestConformanceAssertionGuid017, + L"EFI_SIMPLE_NETWORK_PROTOCOL.Statistics - Invoke Stati= stics() with small buffer.", + L"%a:%d:Status - %r", + __FILE__, + (UINTN)__LINE__, + Status + ); } =20 - =20 - StandardLib->RecordAssertion ( - StandardLib, - AssertionType[0], - gSimpleNetworkBBTestConformanceAssertionGuid014, - L"EFI_SIMPLE_NETWORK_PROTOCOL.Statistics - Invoke Statist= ics() when network interface not start.", - L"%a:%d:Status - %r", - __FILE__, - (UINTN)__LINE__, - StatusBuf[0] - ); - =20 - StandardLib->RecordAssertion ( - StandardLib, - AssertionType[1], - gSimpleNetworkBBTestConformanceAssertionGuid015, - L"EFI_SIMPLE_NETWORK_PROTOCOL.Statistics - Invoke Statist= ics() when network interface not initialized.", - L"%a:%d:Status - %r", - __FILE__, - (UINTN)__LINE__, - StatusBuf[1] - ); - - StandardLib->RecordAssertion ( - StandardLib, - AssertionType[2], - gSimpleNetworkBBTestConformanceAssertionGuid017, - L"EFI_SIMPLE_NETWORK_PROTOCOL.Statistics - Invoke Statist= ics() with small buffer.", - L"%a:%d:Status - %r", - __FILE__, - (UINTN)__LINE__, - StatusBuf[2] - ); - // // Restore SNP State // --=20 2.14.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#48680): https://edk2.groups.io/g/devel/message/48680 Mute This Topic: https://groups.io/mt/34470789/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-