From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web12.5374.1570761473048977067 for ; Thu, 10 Oct 2019 19:37:53 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: xianhuix.liu@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Oct 2019 19:37:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,282,1566889200"; d="scan'208";a="206305818" Received: from xianhu2x-mobl.ccr.corp.intel.com ([10.239.196.115]) by orsmga002.jf.intel.com with ESMTP; 10 Oct 2019 19:37:50 -0700 From: "xianhui liu" To: devel@edk2.groups.io Cc: Heinrich Schuchardt , Supreeth Venkatesh , Eric Jin , xianhui liu Subject: [edk2-test][Patch] uefi-sct/SctPkg: Sync SNP ReceiveFilters change to IHV Date: Fri, 11 Oct 2019 10:37:47 +0800 Message-Id: <20191011023747.10472-1-xianhuix.liu@intel.com> X-Mailer: git-send-email 2.14.1.windows.1 REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2197 sync commit 3d98de052fcd47f187190802e6201ac6aaabfda7 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 | 223 +++++++++++++-------- 1 file changed, 138 insertions(+), 85 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 c758f560..682076ea 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 @@ -626,22 +626,31 @@ BBTestReceiveFilterConformanceTest ( // Call ReceiveFilters() function if network interface not start. // Status = SnpInterface->ReceiveFilters (SnpInterface, 0, 0, FALSE, 0, NULL); - if ((Status == EFI_NOT_STARTED) && (SnpInterface->Mode->State == EfiSimpleNetworkStopped)) { - AssertionType = EFI_TEST_ASSERTION_PASSED; + if (Status == EFI_UNSUPPORTED) { + StandardLib->RecordMessage( + StandardLib, + EFI_VERBOSE_LEVEL_QUIET, + L"ReceiveFilters isn't supported, Status - %r\n", + Status + ); } else { - AssertionType = 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, - gSimpleNetworkBBTestConformanceAssertionGuid006, - L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke ReceiveFilters() when network interface not start.", - L"%a:%d:Status - %r", - __FILE__, - (UINTN)__LINE__, - Status - ); + StandardLib->RecordAssertion ( + StandardLib, + AssertionType, + gSimpleNetworkBBTestConformanceAssertionGuid006, + L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke ReceiveFilters() when network interface not start.", + L"%a:%d:Status - %r", + __FILE__, + (UINTN)__LINE__, + Status + ); + } // // Assertion Point 5.6.2.2 @@ -653,22 +662,31 @@ BBTestReceiveFilterConformanceTest ( } Status = SnpInterface->ReceiveFilters (SnpInterface, 0, 0, FALSE, 0, NULL); - if (Status == EFI_DEVICE_ERROR) { - AssertionType = EFI_TEST_ASSERTION_PASSED; + if (Status == EFI_UNSUPPORTED) { + StandardLib->RecordMessage( + StandardLib, + EFI_VERBOSE_LEVEL_QUIET, + L"ReceiveFilters isn't supported, Status - %r\n", + Status + ); } else { - AssertionType = EFI_TEST_ASSERTION_FAILED; - } + if (Status == EFI_DEVICE_ERROR) { + AssertionType = EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType = EFI_TEST_ASSERTION_FAILED; + } - StandardLib->RecordAssertion ( - StandardLib, - AssertionType, - gSimpleNetworkBBTestConformanceAssertionGuid007, - L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke ReceiveFilters() when network interface not initialized.", - L"%a:%d:Status - %r", - __FILE__, - (UINTN)__LINE__, - Status - ); + StandardLib->RecordAssertion ( + StandardLib, + AssertionType, + gSimpleNetworkBBTestConformanceAssertionGuid007, + L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke ReceiveFilters() when network interface not initialized.", + L"%a:%d:Status - %r", + __FILE__, + (UINTN)__LINE__, + Status + ); + } // // Assertion Point 5.6.2.3 @@ -683,22 +701,31 @@ BBTestReceiveFilterConformanceTest ( // Call ReceiveFilters with invalide Enable // Status = SnpInterface->ReceiveFilters (SnpInterface, ~(SnpInterface->Mode->ReceiveFilterMask), 0, FALSE, 0, NULL); - if (Status == EFI_INVALID_PARAMETER) { - AssertionType = EFI_TEST_ASSERTION_PASSED; + if (Status == EFI_UNSUPPORTED) { + StandardLib->RecordMessage( + StandardLib, + EFI_VERBOSE_LEVEL_QUIET, + L"ReceiveFilters isn't supported, Status - %r\n", + Status + ); } else { - AssertionType = EFI_TEST_ASSERTION_FAILED; - } + if (Status == EFI_INVALID_PARAMETER) { + AssertionType = EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType = EFI_TEST_ASSERTION_FAILED; + } - StandardLib->RecordAssertion ( - StandardLib, - AssertionType, - gSimpleNetworkBBTestConformanceAssertionGuid008, - L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke ReceiveFilters() with invalid Enable.", - L"%a:%d:Status - %r", - __FILE__, - (UINTN)__LINE__, - Status - ); + StandardLib->RecordAssertion ( + StandardLib, + AssertionType, + gSimpleNetworkBBTestConformanceAssertionGuid008, + L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke ReceiveFilters() with invalid Enable.", + L"%a:%d:Status - %r", + __FILE__, + (UINTN)__LINE__, + Status + ); + } // // Call ReceiveFilters with invalide MCastFilterCnt @@ -713,59 +740,85 @@ BBTestReceiveFilterConformanceTest ( MAC.Addr[5] = 0x02; Status = SnpInterface->ReceiveFilters (SnpInterface, EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST, 0, FALSE, SnpInterface->Mode->MaxMCastFilterCount + 1, &MAC); - if (Status == EFI_INVALID_PARAMETER) { - AssertionType = EFI_TEST_ASSERTION_PASSED; + if (Status == EFI_UNSUPPORTED) { + StandardLib->RecordMessage( + StandardLib, + EFI_VERBOSE_LEVEL_QUIET, + L"ReceiveFilters isn't supported, Status - %r\n", + Status + ); } else { - AssertionType = EFI_TEST_ASSERTION_FAILED; + if (Status == EFI_INVALID_PARAMETER) { + AssertionType = EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType = EFI_TEST_ASSERTION_FAILED; + } + + StandardLib->RecordAssertion ( + StandardLib, + AssertionType, + gSimpleNetworkBBTestConformanceAssertionGuid009, + L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke ReceiveFilters() with invalid MCastFilterCnt is greater than Snp->Mode->MaxMCastFilterCount.", + L"%a:%d:Status - %r", + __FILE__, + (UINTN)__LINE__, + Status + ); } - StandardLib->RecordAssertion ( - StandardLib, - AssertionType, - gSimpleNetworkBBTestConformanceAssertionGuid009, - L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke ReceiveFilters() with invalid MCastFilterCnt is greater than Snp->Mode->MaxMCastFilterCount.", - L"%a:%d:Status - %r", - __FILE__, - (UINTN)__LINE__, - Status - ); - Status = SnpInterface->ReceiveFilters (SnpInterface, EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST, 0, FALSE, 0, &MAC); - if (Status == EFI_INVALID_PARAMETER) { - AssertionType = EFI_TEST_ASSERTION_PASSED; + if (Status == EFI_UNSUPPORTED) { + StandardLib->RecordMessage( + StandardLib, + EFI_VERBOSE_LEVEL_QUIET, + L"ReceiveFilters isn't supported, Status - %r\n", + Status + ); } else { - AssertionType = EFI_TEST_ASSERTION_FAILED; + if (Status == EFI_INVALID_PARAMETER) { + AssertionType = EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType = EFI_TEST_ASSERTION_FAILED; + } + + StandardLib->RecordAssertion ( + StandardLib, + AssertionType, + gSimpleNetworkBBTestConformanceAssertionGuid043, + L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke ReceiveFilters() with invalid MCastFilterCnt is 0.", + L"%a:%d:Status - %r", + __FILE__, + (UINTN)__LINE__, + Status + ); } - StandardLib->RecordAssertion ( - StandardLib, - AssertionType, - gSimpleNetworkBBTestConformanceAssertionGuid043, - L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke ReceiveFilters() with invalid MCastFilterCnt is 0.", - L"%a:%d:Status - %r", - __FILE__, - (UINTN)__LINE__, - Status - ); - Status = SnpInterface->ReceiveFilters (SnpInterface, EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST, 0, FALSE, 1, NULL); - if (Status == EFI_INVALID_PARAMETER) { - AssertionType = EFI_TEST_ASSERTION_PASSED; + if (Status == EFI_UNSUPPORTED) { + StandardLib->RecordMessage( + StandardLib, + EFI_VERBOSE_LEVEL_QUIET, + L"ReceiveFilters isn't supported, Status - %r\n", + Status + ); } else { - AssertionType = EFI_TEST_ASSERTION_FAILED; + if (Status == EFI_INVALID_PARAMETER) { + AssertionType = EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType = EFI_TEST_ASSERTION_FAILED; + } + + StandardLib->RecordAssertion ( + StandardLib, + AssertionType, + gSimpleNetworkBBTestConformanceAssertionGuid010, + L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke ReceiveFilters() with MCastFilterCnt not match MCastFilter.", + L"%a:%d:Status - %r", + __FILE__, + (UINTN)__LINE__, + Status + ); } - - StandardLib->RecordAssertion ( - StandardLib, - AssertionType, - gSimpleNetworkBBTestConformanceAssertionGuid010, - L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke ReceiveFilters() with MCastFilterCnt not match MCastFilter.", - L"%a:%d:Status - %r", - __FILE__, - (UINTN)__LINE__, - Status - ); - } // -- 2.14.1.windows.1