[edk2-devel] [edk2-test][Patch] uefi-sct/SctPkg: Sync SimpleTesxtInputEx change to IHV

xianhui liu posted 1 patch 1 week ago
Failed in applying to current master (apply log)
.../BlackBoxTest/SimpleTextInputExBBTestConformance.c          | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)

[edk2-devel] [edk2-test][Patch] uefi-sct/SctPkg: Sync SimpleTesxtInputEx change to IHV

Posted by xianhui liu 1 week ago
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2169
sync commit fc1a95f7b1a4c157d0536bc159bc5114cdfcb9b4
on file EFI/Protocol/SimpleTextInputEx/BlackBoxTest
/SimpleTextInputExBBTestConformance.c to IHV

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/SimpleTextInputExBBTestConformance.c          | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTestConformance.c
index 3e230f9e..e1797219 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTestConformance.c
@@ -1,7 +1,7 @@
 /** @file
 
   Copyright 2006 - 2016 Unified EFI, Inc.<BR>
-  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>
 
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
@@ -153,7 +153,7 @@ BBTestSetStateConformanceTest (
         return Status;
       }
       BBTestSetStateConformanceTestCheckpoint2 ( StandardLib, SimpleTextInputEx );
-  
+
       Status = gtBS->FreePool (DevicePathStr);
       if (EFI_ERROR(Status))
         return Status;
@@ -483,8 +483,10 @@ BBTestSetStateConformanceTestCheckpoint1 (
                         );
     }
   }
-  
-  if ( EFI_INVALID_PARAMETER != Status) {
+
+  if (Status == EFI_UNSUPPORTED) {
+    AssertionType = EFI_TEST_ASSERTION_WARNING;
+  } else if (Status != EFI_INVALID_PARAMETER) {
     AssertionType = EFI_TEST_ASSERTION_FAILED;
   } else {
     AssertionType = EFI_TEST_ASSERTION_PASSED;
-- 
2.14.1.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#48627): https://edk2.groups.io/g/devel/message/48627
Mute This Topic: https://groups.io/mt/34460889/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-test][Patch] uefi-sct/SctPkg: Sync SimpleTesxtInputEx change to IHV

Posted by Eric Jin 6 days ago
Hi Xianhui,

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of xianhui
> liu
> Sent: Wednesday, October 9, 2019 4:09 PM
> To: devel@edk2.groups.io
> Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>; Supreeth Venkatesh
> <supreeth.venkatesh@arm.com>; Jin, Eric <eric.jin@intel.com>; Liu,
> XianhuiX <xianhuix.liu@intel.com>
> Subject: [edk2-devel] [edk2-test][Patch] uefi-sct/SctPkg: Sync
> SimpleTesxtInputEx change to IHV

Typo here: SimpleTesxtInputEx should be SimpleTextInputEx

Best Regards
Eric

> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2169
> sync commit fc1a95f7b1a4c157d0536bc159bc5114cdfcb9b4
> on file EFI/Protocol/SimpleTextInputEx/BlackBoxTest
> /SimpleTextInputExBBTestConformance.c to IHV
> 
> 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/SimpleTextInputExBBTestConformance.c          | 10 ++++++-
> ---
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/uefi-
> sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextInputEx/BlackBoxTest/Si
> mpleTextInputExBBTestConformance.c b/uefi-
> sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextInputEx/BlackBoxTest/Si
> mpleTextInputExBBTestConformance.c
> index 3e230f9e..e1797219 100644
> --- a/uefi-
> sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextInputEx/BlackBoxTest/Si
> mpleTextInputExBBTestConformance.c
> +++ b/uefi-
> sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextInputEx/Black
> +++ BoxTest/SimpleTextInputExBBTestConformance.c
> @@ -1,7 +1,7 @@
>  /** @file
> 
>    Copyright 2006 - 2016 Unified EFI, Inc.<BR>
> -  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2010 - 2019, Intel Corporation. All rights
> + reserved.<BR>
> 
>    This program and the accompanying materials
>    are licensed and made available under the terms and conditions of the BSD
> License @@ -153,7 +153,7 @@ BBTestSetStateConformanceTest (
>          return Status;
>        }
>        BBTestSetStateConformanceTestCheckpoint2 ( StandardLib,
> SimpleTextInputEx );
> -
> +
>        Status = gtBS->FreePool (DevicePathStr);
>        if (EFI_ERROR(Status))
>          return Status;
> @@ -483,8 +483,10 @@ BBTestSetStateConformanceTestCheckpoint1 (
>                          );
>      }
>    }
> -
> -  if ( EFI_INVALID_PARAMETER != Status) {
> +
> +  if (Status == EFI_UNSUPPORTED) {
> +    AssertionType = EFI_TEST_ASSERTION_WARNING;  } else if (Status !=
> + EFI_INVALID_PARAMETER) {
>      AssertionType = EFI_TEST_ASSERTION_FAILED;
>    } else {
>      AssertionType = EFI_TEST_ASSERTION_PASSED;
> --
> 2.14.1.windows.1
> 
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#48675): https://edk2.groups.io/g/devel/message/48675
Mute This Topic: https://groups.io/mt/34460889/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-