From: Grant Likely <grant.likely@arm.com>
To: Heinrich Schuchardt <xypron.glpk@gmx.de>, devel@edk2.groups.io
Cc: nd@arm.com, G Edhaya Chandran <Edhaya.Chandran@arm.com>,
Samer El-Haj-Mahmoud <samer.el-haj-mahmoud@arm.com>,
Eric Jin <eric.jin@intel.com>
Subject: Re: [PATCH] Check return status on calls to GetTime()
Date: Tue, 4 Aug 2020 16:46:15 +0100 [thread overview]
Message-ID: <9820fdd3-680d-69f2-a7bd-47bf5043227d@arm.com> (raw)
In-Reply-To: <117e027c-3389-1b0c-4fb3-33418bf7976f@gmx.de>
On 01/08/2020 14:54, Heinrich Schuchardt wrote:
> On 7/31/20 7:19 PM, Grant Likely wrote:
[...]>> diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MiscBootServices/BlackBoxTest/MiscBootServicesBBTestFunction.c
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MiscBootServices/BlackBoxTest/MiscBootServicesBBTestFunction.c
>> index 1d231d8c..3a530282 100644
>> --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MiscBootServices/BlackBoxTest/MiscBootServicesBBTestFunction.c
>> +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MiscBootServices/BlackBoxTest/MiscBootServicesBBTestFunction.c
>> @@ -27,6 +27,8 @@ Abstract:
>> #include "SctLib.h"
>
> I tried to apply your patch with 'git am --keep-cr'. This chunk has a
> problem.
>
> While all other lines in the file have CR LF line endings this very line
> has only LF in EDK2 master. But your patch has CR LF for the line.
>
> Did you use Windows and not Linux to create the patch?
Hahaha! No, I did not use Windows. From what I can tell, that file
already had inconsisten line endings. Most of the file is crlf, but the
"#include "SctLib.h" line is lf only. This confuses vim which interprets
it as a unix file and shows the ^M on every line, which in turn allowed
me to add additional lines with unix line endings.
> I could apply your patch after removing the extraneous CR.
>
> With your patch applied if GetTime() returns EFI_UNSUPPORTED, the test
> log is not garbled anymore:
>
> SetVariable_Conf:
> Test Finished: 01/01/70 12:00a
> Elapsed Time: 00 Days 00:00:00
>
> If GetTime() is available:
>
> SetVariable_Conf:
> Test Finished: 08/01/20 01:52p
> Elapsed Time: 00 Days 00:00:04
>
> Except for the line-endings:
>
> Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Ace! Thanks.
g.
next prev parent reply other threads:[~2020-08-04 15:46 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-31 17:19 [PATCH] Check return status on calls to GetTime() Grant Likely
2020-08-01 13:54 ` Heinrich Schuchardt
2020-08-04 15:46 ` Grant Likely [this message]
2020-08-04 11:26 ` Samer El-Haj-Mahmoud
2020-08-06 13:31 ` Samer El-Haj-Mahmoud
2020-08-06 14:08 ` Heinrich Schuchardt
2020-08-11 19:50 ` [edk2-devel] " G Edhaya Chandran
2020-08-11 20:00 ` G Edhaya Chandran
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=9820fdd3-680d-69f2-a7bd-47bf5043227d@arm.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