From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: xianhuix.liu@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False 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" 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-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> X-Mailer: git-send-email 2.14.1.windows.1 REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2160 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 --- .../BlackBoxTest/SimpleNetworkBBTestConformance.c | 125 ++++++++++++--------- 1 file changed, 73 insertions(+), 52 deletions(-) diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/IHV/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 Copyright 2006 - 2016 Unified EFI, Inc.
- Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
+ Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -964,8 +964,7 @@ BBTestStatisticsConformanceTest ( { EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib; EFI_STATUS Status; - EFI_STATUS StatusBuf[3]; - 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 = 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] = SnpInterface->Statistics (SnpInterface, FALSE, &StatisticsSize, &StatisticsTable); - if ((StatusBuf[0] == EFI_NOT_STARTED) && (SnpInterface->Mode->State == EfiSimpleNetworkStopped)) { - AssertionType[0] = EFI_TEST_ASSERTION_PASSED; + Status = SnpInterface->Statistics (SnpInterface, FALSE, &StatisticsSize, &StatisticsTable); + if (Status == EFI_UNSUPPORTED) { + StandardLib->RecordMessage( + StandardLib, + EFI_VERBOSE_LEVEL_QUIET, + L"Statistics isn't supported, Status - %r\n", + Status + ); } else { - AssertionType[0] = EFI_TEST_ASSERTION_FAILED; + if ((Status == EFI_NOT_STARTED) && (SnpInterface->Mode->State == EfiSimpleNetworkStopped)) { + AssertionType = EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType = EFI_TEST_ASSERTION_FAILED; + } + StandardLib->RecordAssertion ( + StandardLib, + AssertionType, + gSimpleNetworkBBTestConformanceAssertionGuid014, + L"EFI_SIMPLE_NETWORK_PROTOCOL.Statistics - Invoke Statistics() while network interface not started.", + L"%a:%d:Status - %r", + __FILE__, + (UINTN)__LINE__, + Status + ); } // // Assertion Point 5.8.2.2 - // Call Statistics() function if network interface not initialized. + // Call Statistics() function while network interface is not initialized. // Status = SnpInterface->Start (SnpInterface); if (EFI_ERROR(Status)) { return Status; } - StatusBuf[1] = SnpInterface->Statistics (SnpInterface, FALSE, &StatisticsSize, &StatisticsTable); - if (StatusBuf[1] == EFI_DEVICE_ERROR) { - AssertionType[1] = EFI_TEST_ASSERTION_PASSED; + Status = SnpInterface->Statistics (SnpInterface, FALSE, &StatisticsSize, &StatisticsTable); + if (Status == EFI_UNSUPPORTED) { + StandardLib->RecordMessage( + StandardLib, + EFI_VERBOSE_LEVEL_QUIET, + L"Statistics isn't supported, Status - %r\n", + Status + ); } else { - AssertionType[1] = EFI_TEST_ASSERTION_FAILED; + if (Status == EFI_DEVICE_ERROR) { + AssertionType = EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType = EFI_TEST_ASSERTION_FAILED; + } + StandardLib->RecordAssertion ( + StandardLib, + AssertionType, + gSimpleNetworkBBTestConformanceAssertionGuid015, + L"EFI_SIMPLE_NETWORK_PROTOCOL.Statistics - Invoke Statistics() while network interface is not initialized.", + L"%a:%d:Status - %r", + __FILE__, + (UINTN)__LINE__, + Status + ); } - // // Assertion Point 5.8.2.3 @@ -1053,47 +1089,32 @@ BBTestStatisticsConformanceTest ( // StatisticsSize = 0; - StatusBuf[2] = SnpInterface->Statistics (SnpInterface, FALSE, &StatisticsSize, &StatisticsTable); - if (StatusBuf[2] == EFI_BUFFER_TOO_SMALL || Status == EFI_UNSUPPORTED) { - AssertionType[2] = EFI_TEST_ASSERTION_PASSED; + Status = SnpInterface->Statistics (SnpInterface, FALSE, &StatisticsSize, &StatisticsTable); + if (Status == EFI_UNSUPPORTED) { + StandardLib->RecordMessage( + StandardLib, + EFI_VERBOSE_LEVEL_QUIET, + L"Statistics isn't supported, Status - %r\n", + Status + ); } else { - AssertionType[2] = EFI_TEST_ASSERTION_FAILED; + if (Status == EFI_BUFFER_TOO_SMALL) { + AssertionType = EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType = EFI_TEST_ASSERTION_FAILED; + } + StandardLib->RecordAssertion ( + StandardLib, + AssertionType, + gSimpleNetworkBBTestConformanceAssertionGuid017, + L"EFI_SIMPLE_NETWORK_PROTOCOL.Statistics - Invoke Statistics() with small buffer.", + L"%a:%d:Status - %r", + __FILE__, + (UINTN)__LINE__, + Status + ); } - - StandardLib->RecordAssertion ( - StandardLib, - AssertionType[0], - gSimpleNetworkBBTestConformanceAssertionGuid014, - L"EFI_SIMPLE_NETWORK_PROTOCOL.Statistics - Invoke Statistics() when network interface not start.", - L"%a:%d:Status - %r", - __FILE__, - (UINTN)__LINE__, - StatusBuf[0] - ); - - StandardLib->RecordAssertion ( - StandardLib, - AssertionType[1], - gSimpleNetworkBBTestConformanceAssertionGuid015, - L"EFI_SIMPLE_NETWORK_PROTOCOL.Statistics - Invoke Statistics() 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 Statistics() with small buffer.", - L"%a:%d:Status - %r", - __FILE__, - (UINTN)__LINE__, - StatusBuf[2] - ); - // // Restore SNP State // -- 2.14.1.windows.1