public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Eric Jin" <eric.jin@intel.com>
To: "devel@edk2.groups.io" <devel@edk2.groups.io>,
	"Liu, XianhuiX" <xianhuix.liu@intel.com>
Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>,
	Supreeth Venkatesh <supreeth.venkatesh@arm.com>
Subject: Re: [edk2-devel] [edk2-test][Patch] uefi-sct/SctPkg: Add MediaPresentSupported check
Date: Tue, 24 Sep 2019 03:33:11 +0000	[thread overview]
Message-ID: <DA72DC7456565B47808A57108259571F63818675@SHSMSX103.ccr.corp.intel.com> (raw)
In-Reply-To: <20190923014221.14780-1-xianhuix.liu@intel.com>

Xianhui,

The content is clear to me.
Two comments:
1. The copyright year is not updated. I will help to update when I commit, but hold one day to wait for possible comments.
Reviewed-by: Eric Jin <eric.jin@intel.com>

2. Could you please provide the patch on the IHV part? Thanks.

Best Regards
Eric
-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of xianhui liu
Sent: Monday, September 23, 2019 9:42 AM
To: devel@edk2.groups.io
Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>; Supreeth Venkatesh <supreeth.venkatesh@arm.com>; Jin, Eric <eric.jin@intel.com>
Subject: [edk2-devel] [edk2-test][Patch] uefi-sct/SctPkg: Add MediaPresentSupported check

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2061
check MediaPresent while MediaPresentSupported is TRUE

Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>
Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
Cc: Eric Jin <eric.jin@intel.com>

Signed-off-by: xianhui liu <xianhuix.liu@intel.com>
---
 .../BlackBoxTest/SimpleNetworkBBTestFunction.c     | 64 +++++++++++-----------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestFunction.c
index 133ef8a9..563e5361 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestFunction.c
@@ -1888,38 +1888,40 @@ BBTestGetStatusFunctionTest (
   Status = SnpInterface->GetStatus (SnpInterface, &InterruptStatus, &TxBuf);
   Status1 = SnpInterface->GetStatus (SnpInterface, &InterruptStatus, &TxBuf);
 
-  if (SnpInterface->Mode->MediaPresent == FALSE) {
-    if ((Status1 == EFI_SUCCESS) && (Status == EFI_SUCCESS) && (InterruptStatus == 0)) {
-      AssertionType = EFI_TEST_ASSERTION_PASSED;
-    } else {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
-  } else {
-    if ((Status1 == EFI_SUCCESS) && (Status == EFI_SUCCESS)) {
-      AssertionType = EFI_TEST_ASSERTION_PASSED;
-      if (InterruptStatus &
-         ~( EFI_SIMPLE_NETWORK_RECEIVE_INTERRUPT |
-            EFI_SIMPLE_NETWORK_TRANSMIT_INTERRUPT |
-            EFI_SIMPLE_NETWORK_COMMAND_INTERRUPT |
-            EFI_SIMPLE_NETWORK_SOFTWARE_INTERRUPT)) {
-        AssertionType = EFI_TEST_ASSERTION_FAILED;
-      }
-    } else {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
+  if (SnpInterface->Mode-> MediaPresentSupported == TRUE) {
+     if (SnpInterface->Mode->MediaPresent == FALSE) {
+       if ((Status1 == EFI_SUCCESS) && (Status == EFI_SUCCESS) && (InterruptStatus == 0)) {
+         AssertionType = EFI_TEST_ASSERTION_PASSED;
+       } else {
+         AssertionType = EFI_TEST_ASSERTION_FAILED;
+       }
+     } else {
+       if ((Status1 == EFI_SUCCESS) && (Status == EFI_SUCCESS)) {
+         AssertionType = EFI_TEST_ASSERTION_PASSED;
+         if (InterruptStatus &
+            ~( EFI_SIMPLE_NETWORK_RECEIVE_INTERRUPT |
+               EFI_SIMPLE_NETWORK_TRANSMIT_INTERRUPT |
+               EFI_SIMPLE_NETWORK_COMMAND_INTERRUPT |
+               EFI_SIMPLE_NETWORK_SOFTWARE_INTERRUPT)) {
+           AssertionType = EFI_TEST_ASSERTION_FAILED;
+         }
+       } else {
+         AssertionType = EFI_TEST_ASSERTION_FAILED;
+       }
+     }
+     StandardLib->RecordAssertion (
+                    StandardLib,
+                    AssertionType,
+                    gSimpleNetworkBBTestFunctionAssertionGuid022,
+                    L"EFI_SIMPLE_NETWORK_PROTOCOL.GetStatus - Invoke GetStatus() and verify interface correctness within test case",
+                    L"%a:%d:Status - %r, Status1 - %r, InterruptStatus - %d",
+                    __FILE__,
+                    (UINTN)__LINE__,
+                    Status,
+                    Status1,
+                    InterruptStatus
+                    );
   }
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gSimpleNetworkBBTestFunctionAssertionGuid022,
-                 L"EFI_SIMPLE_NETWORK_PROTOCOL.GetStatus - Invoke GetStatus() and verify interface correctness within test case",
-                 L"%a:%d:Status - %r, Status1 - %r, InterruptStatus - %d",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 Status,
-                 Status1,
-                 InterruptStatus
-                 );
 
   //
   // Restore SNP State
-- 
2.14.1.windows.1





  reply	other threads:[~2019-09-24  3:33 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-23  1:42 [edk2-test][Patch] uefi-sct/SctPkg: Add MediaPresentSupported check xianhuix.liu
2019-09-24  3:33 ` Eric Jin [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-09-24  8:50 xianhui liu
2019-09-24 19:05 ` Heinrich Schuchardt
2019-09-25  2:18   ` [edk2-devel] " xianhui liu
     [not found]   ` <15C78CE54FBDEE07.4626@groups.io>
2019-09-27  2:01     ` xianhui liu
2019-09-27  6:00       ` Heinrich Schuchardt
2019-09-27  6:36         ` Eric Jin
     [not found]         ` <15C83824ED461154.3061@groups.io>
2019-09-29  3:37           ` Eric Jin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=DA72DC7456565B47808A57108259571F63818675@SHSMSX103.ccr.corp.intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox