* [edk2-test] [PATCH v2 1/1] uefi-sct/SctPkg: SNP Statistics may be unsupported
@ 2019-09-09 9:32 Heinrich Schuchardt
2019-09-10 1:15 ` Eric Jin
[not found] ` <15C2EEC7CC20816E.1448@groups.io>
0 siblings, 2 replies; 3+ messages in thread
From: Heinrich Schuchardt @ 2019-09-09 9:32 UTC (permalink / raw)
To: EDK II Development
Cc: Eric Jin, Supreeth Venkatesh, Stephano Cetola,
Heinrich Schuchardt
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2160
If EFI_SIMPLE_NETWORK.Statistics() is not supported, it will return
EFI_UNSUPPORTED. In this case do not expect input parameters to be checked
for conformance.
If an error in SnpInterface->Start() occurs we error out. Therefore create
assertion messages always directly after each individual check.
Fix some typos in comments and messages.
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---
v2:
Create assertion messages always directly after each individual check.
Fix typos in comments and messages.
---
.../SimpleNetworkBBTestConformance.c | 123 ++++++++++--------
1 file changed, 72 insertions(+), 51 deletions(-)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestConformance.c
index 9d5bec18..9bd21a76 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestConformance.c
@@ -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.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [edk2-test] [PATCH v2 1/1] uefi-sct/SctPkg: SNP Statistics may be unsupported
2019-09-09 9:32 [edk2-test] [PATCH v2 1/1] uefi-sct/SctPkg: SNP Statistics may be unsupported Heinrich Schuchardt
@ 2019-09-10 1:15 ` Eric Jin
[not found] ` <15C2EEC7CC20816E.1448@groups.io>
1 sibling, 0 replies; 3+ messages in thread
From: Eric Jin @ 2019-09-10 1:15 UTC (permalink / raw)
To: Heinrich Schuchardt, EDK II Development
Cc: Supreeth Venkatesh, Stephano Cetola
Reviewed-by: Eric Jin <eric.jin@intel.com>
-----Original Message-----
From: Heinrich Schuchardt <xypron.glpk@gmx.de>
Sent: Monday, September 9, 2019 5:32 PM
To: EDK II Development <devel@edk2.groups.io>
Cc: Jin, Eric <eric.jin@intel.com>; Supreeth Venkatesh <supreeth.venkatesh@arm.com>; Stephano Cetola <stephano.cetola@linux.intel.com>; Heinrich Schuchardt <xypron.glpk@gmx.de>
Subject: [edk2-test] [PATCH v2 1/1] uefi-sct/SctPkg: SNP Statistics may be unsupported
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2160
If EFI_SIMPLE_NETWORK.Statistics() is not supported, it will return EFI_UNSUPPORTED. In this case do not expect input parameters to be checked for conformance.
If an error in SnpInterface->Start() occurs we error out. Therefore create assertion messages always directly after each individual check.
Fix some typos in comments and messages.
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---
v2:
Create assertion messages always directly after each individual check.
Fix typos in comments and messages.
---
.../SimpleNetworkBBTestConformance.c | 123 ++++++++++--------
1 file changed, 72 insertions(+), 51 deletions(-)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestConformance.c
index 9d5bec18..9bd21a76 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxT
+++ est/SimpleNetworkBBTestConformance.c
@@ -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.20.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [edk2-devel] [edk2-test] [PATCH v2 1/1] uefi-sct/SctPkg: SNP Statistics may be unsupported
[not found] ` <15C2EEC7CC20816E.1448@groups.io>
@ 2019-09-11 0:43 ` Eric Jin
0 siblings, 0 replies; 3+ messages in thread
From: Eric Jin @ 2019-09-11 0:43 UTC (permalink / raw)
To: devel@edk2.groups.io, Heinrich Schuchardt
Cc: Supreeth Venkatesh, Stephano Cetola
Pushed at 269f8a35e44f2093625b3671f372f68e2983c49d
-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Eric Jin
Sent: Tuesday, September 10, 2019 9:16 AM
To: Heinrich Schuchardt <xypron.glpk@gmx.de>; EDK II Development <devel@edk2.groups.io>
Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>; Stephano Cetola <stephano.cetola@linux.intel.com>
Subject: Re: [edk2-devel] [edk2-test] [PATCH v2 1/1] uefi-sct/SctPkg: SNP Statistics may be unsupported
Reviewed-by: Eric Jin <eric.jin@intel.com>
-----Original Message-----
From: Heinrich Schuchardt <xypron.glpk@gmx.de>
Sent: Monday, September 9, 2019 5:32 PM
To: EDK II Development <devel@edk2.groups.io>
Cc: Jin, Eric <eric.jin@intel.com>; Supreeth Venkatesh <supreeth.venkatesh@arm.com>; Stephano Cetola <stephano.cetola@linux.intel.com>; Heinrich Schuchardt <xypron.glpk@gmx.de>
Subject: [edk2-test] [PATCH v2 1/1] uefi-sct/SctPkg: SNP Statistics may be unsupported
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2160
If EFI_SIMPLE_NETWORK.Statistics() is not supported, it will return EFI_UNSUPPORTED. In this case do not expect input parameters to be checked for conformance.
If an error in SnpInterface->Start() occurs we error out. Therefore create assertion messages always directly after each individual check.
Fix some typos in comments and messages.
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---
v2:
Create assertion messages always directly after each individual check.
Fix typos in comments and messages.
---
.../SimpleNetworkBBTestConformance.c | 123 ++++++++++--------
1 file changed, 72 insertions(+), 51 deletions(-)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestConformance.c
index 9d5bec18..9bd21a76 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxT
+++ est/SimpleNetworkBBTestConformance.c
@@ -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.20.1
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-09-11 0:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-09 9:32 [edk2-test] [PATCH v2 1/1] uefi-sct/SctPkg: SNP Statistics may be unsupported Heinrich Schuchardt
2019-09-10 1:15 ` Eric Jin
[not found] ` <15C2EEC7CC20816E.1448@groups.io>
2019-09-11 0:43 ` [edk2-devel] " Eric Jin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox