Re: [edk2] [edk2-test][PATCH] SctPkg/Tools: Fix incorrect line ending detection by GenBin tool
Hi Supreeth,
The GenBin tool was not being rebuilt due to the existence of previously built
intermediate binary. To resolve this, intermediate binary has to be cleaned
after the build.
I will upload the new patch with the this change.
Thanks,
Lokesh
-Original Message-
From: Supreeth Venkatesh
Sent: Tuesday, November 27, 2018 8:07 PM
To: Lokesh Belathur Veerappa
Cc: eric@intel.com; edk2-devel@lists.01.org
Subject: RE: [edk2-test][PATCH] SctPkg/Tools: Fix incorrect line ending
detection by GenBin tool
Lokesh,
I had applied the GenBin tool rebuild patch before this.
I will check again on my side but please recheck on your side.
Thanks,
Supreeth
-Original Message-
From: Lokesh Belathur Veerappa
Sent: Tuesday, November 27, 2018 2:04 AM
To: Supreeth Venkatesh ; edk2-devel@lists.01.org;
eric@intel.com
Subject: RE: [edk2-test][PATCH] SctPkg/Tools: Fix incorrect line ending
detection by GenBin tool
Hi Supreeth,
The 'GenBin' tool has to be rebuilt with this change. The GenBin tool build
support is added in the patch "[edk2-test][PATCH] SctPkg/build: Add support for
GenBin tool build".
I will upload a single patch which includes both the changes. Please verify and
merge it.
Thanks,
Lokesh
-Original Message-
From: Supreeth Venkatesh
Sent: Tuesday, November 27, 2018 1:56 AM
To: Lokesh Belathur Veerappa ; edk2-devel@lists.01.org;
eric@intel.com
Cc: Lokesh Belathur Veerappa
Subject: RE: [edk2-test][PATCH] SctPkg/Tools: Fix incorrect line ending
detection by GenBin tool
With the latest edk2, I am getting this compilation error (even when this patch
is applied).
I will be looking at it tomorrow. Please check this out if you get a chance.
GenBin
/data/users/supreeth/supven01/work/sct_workspace/edk2/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/UncompressedFile2/UncompressedFile2.ini
/data/users/supreeth/supven01/work/sct_workspace/edk2/Build/UefiSct/DEBUG_GCC49/AARCH64/Decompress_UncompressedFile2.ucmp
Error: Invalid format (Line 30)
Error: Cannot generate the binary file
GNUmakefile:232: recipe for target
'/data/users/supreeth/supven01/work/sct_workspace/edk2/Build/UefiSct/DEBUG_GCC49/AARCH64/Decompress_UncompressedFile2.ucmp'
failed
make: ***
[/data/users/supreeth/supven01/work/sct_workspace/edk2/Build/UefiSct/DEBUG_GCC49/AARCH64/Decompress_UncompressedFile2.ucmp]
Error 255
build.py...
: error 7000: Failed to execute command
make tbuild
[/data/users/supreeth/supven01/work/sct_workspace/edk2/Build/UefiSct/DEBUG_GCC49/AARCH64/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/UncompressedFile2/UncompressedFile2]
Thanks,
Supreeth
-Original Message-
From: Lokesh B V
Sent: Tuesday, November 20, 2018 12:50 AM
To: edk2-devel@lists.01.org; Supreeth Venkatesh ;
eric@intel.com
Cc: Lokesh Belathur Veerappa
Subject: [edk2-test][PATCH] SctPkg/Tools: Fix incorrect line ending detection
by GenBin tool
Some windows editors uses "\r\n" for line feed. While processing uefi testcase
info file, the GenBin tool logic to skip line feed doesn't consider the
presence of carraige return(\r) in line feed. So this results in incorrect
format error.
Signed-off-by: Lokesh B V
---
uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
b/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
index 61bb35b..ce271a1 100644
--- a/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
+++ b/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
@@ -176,6 +176,7 @@ Trim (
for (Index1 = 0; Index1 < Length; Index1++) {
if ((String[Index1] != ' ' ) &&
(String[Index1] != '\t') &&
+(String[Index1] != '\r') &&
(String[Index1] != '\n')) {
break;
}
@@ -193,6 +194,7 @@ Trim (
for (Index1 = 0; Index1 < Length; Index1++) {
if ((String[Length - 1 - Index1] != ' ' ) &&
(String[Length - 1 - Index1] != '\t') &&
+(String[Length - 1 - Index1] != '\r') &&
(String[Length - 1 - Index1] != '\n')) {
break;
}
--
2.7.4
IMPORTANT NOTICE: The contents of this email and any attachments are
confidential and may also be privileged. If you are not the intended recipient,
please notify the sender immediately and do not disclose the contents to any
other person, use it for any purpose, or store or copy the information in any
medium. Thank you.
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] [edk2-test][PATCH v2] SctPkg/build: Add support for GenBin tool build
Hi Philippe,
-Original Message-
From: Philippe Mathieu-Daudé
Sent: Tuesday, November 27, 2018 3:20 PM
To: Lokesh Belathur Veerappa ; edk2-devel@lists.01.org
Subject: Re: [edk2] [PATCH] [edk2-test][PATCH v2] SctPkg/build: Add support for
GenBin tool build
Hi,
On 27/11/18 9:35, Lokesh B V wrote:
> As the GenBin tool is necessary for SCT build, it is appropriate to
> support it's build in the SCT build procedure.
>
> SctPkg/Tools: Fix incorrect line ending detection by GenBin tool
>
> Some windows editors uses "\r\n" for line feed. While processing uefi
> testcase info file, the GenBin tool logic to skip line feed doesn't
> consider the presence of carraige return(\r) in line feed. So this results in
> incorrect format error.
Minor typo: "carriage"
Thanks, will update the patch.
>
> Cc: Supreeth Venkatesh
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Lokesh B V
> ---
> .gitignore | 1 +
> uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c | 3 +++
> uefi-sct/SctPkg/build.sh | 31
>
> 3 files changed, 22 insertions(+), 13 deletions(-)
>
> diff --git a/.gitignore b/.gitignore
> index 821ed66..3b8d818 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -1,2 +1,3 @@
> Build/
> tags/
> +*.[od]
> diff --git a/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
> b/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
> index 61bb35b..4eaefcc 100644
> --- a/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
> +++ b/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
> @@ -2,6 +2,7 @@
>
>Copyright 2006 - 2010 Unified EFI, Inc.
>Copyright (c) 2010 Intel Corporation. All rights reserved.
> + Copyright (c) 2018 ARM Ltd. All rights reserved.
>
>This program and the accompanying materials
>are licensed and made available under the terms and conditions of
> the BSD License @@ -176,6 +177,7 @@ Trim (
>for (Index1 = 0; Index1 < Length; Index1++) {
> if ((String[Index1] != ' ' ) &&
> (String[Index1] != '\t') &&
> +(String[Index1] != '\r') &&
> (String[Index1] != '\n')) {
>break;
> }
> @@ -193,6 +195,7 @@ Trim (
>for (Index1 = 0; Index1 < Length; Index1++) {
> if ((String[Length - 1 - Index1] != ' ' ) &&
> (String[Length - 1 - Index1] != '\t') &&
> +(String[Length - 1 - Index1] != '\r') &&
> (String[Length - 1 - Index1] != '\n')) {
>break;
> }
> diff --git a/uefi-sct/SctPkg/build.sh b/uefi-sct/SctPkg/build.sh index
> 73581c9..6198532 100755
> --- a/uefi-sct/SctPkg/build.sh
> +++ b/uefi-sct/SctPkg/build.sh
> @@ -1,7 +1,7 @@
> #!/bin/bash
> #
> # Copyright 2006 - 2015 Unified EFI, Inc. -# Copyright (c) 2011
> - 2015, ARM Ltd. All rights reserved.
> +# Copyright (c) 2011 - 2018, ARM Ltd. All rights reserved.
> #
> # This program and the accompanying materials # are licensed and
> made available under the terms and conditions of the BSD License @@
> -228,21 +228,26 @@ else
>echo using prebuilt tools
> fi
>
> -# Copy GenBin file to Base tools directory
> +if [[ ! -e $EDK_TOOLS_PATH/Source/C/bin/GenBin ]] then
> + # build the GenBin if it doesn't yet exist
> + echo Building GenBin
> + make -C $EDK_TOOLS_PATH/../SctPkg/Tools/Source/GenBin
> + status=$?
> + if test $status -ne 0
> + then
> + echo Error while building GenBin
> +exit -1
> + fi
> +else
> + echo using prebuilt GenBin
> +fi
> +
> +# Copy GenBin file to Base tools bin directory
> DEST_DIR=`GetEdkToolsPathBinDirectory`
> # Ensure the directory exist
> mkdir -p $DEST_DIR
> -case `uname -m` in
> -x86_64)
> -cp SctPkg/Tools/Bin/GenBin_lin_64 $DEST_DIR/GenBin
> -;;
> -x86_32)
> -cp SctPkg/Tools/Bin/GenBin_lin_32 $DEST_DIR/GenBin
> -;;
> -*)
> -cp SctPkg/Tools/Bin/GenBin_lin_32 $DEST_DIR/GenBin
> -;;
> -esac
> +cp $EDK_TOOLS_PATH/Source/C/bin/GenBin $DEST_DIR/GenBin
>
> #
> # Build the SCT package
>
IMPORTANT NOTICE: The contents of this email and any attachments are
confidential and may also be privileged. If you are not the intended recipient,
please notify the sender immediately and do not disclose the contents to any
other person, use it for any purpose, or store or copy the information in any
medium. Thank you.
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [edk2-test][PATCH] Framework/Include: allow usage with EFI version 2.7
Hello Supreeth, I verified this patch against latest edk2. Please verify from your side and merge it. Thanks, Lokesh -Original Message- From: edk2-devel On Behalf Of Lokesh Belathur Veerappa Sent: Wednesday, November 21, 2018 11:00 AM To: Supreeth Venkatesh ; edk2-devel@lists.01.org; eric@intel.com Subject: Re: [edk2] [edk2-test][PATCH] Framework/Include: allow usage with EFI version 2.7 Hi Supreeth, Yes it has been compiled and tested against edk2 with SHA da2c81ee96eba5d5c8ef91fd870ac98d3cf72beb. -Original Message- From: Supreeth Venkatesh Sent: Tuesday, November 20, 2018 8:34 PM To: Lokesh Belathur Veerappa ; edk2-devel@lists.01.org; eric@intel.com Cc: Lokesh Belathur Veerappa Subject: RE: [edk2-test][PATCH] Framework/Include: allow usage with EFI version 2.7 Thanks Lokesh for the patch. Has this been compiled and sanity tested against latest edk2? Let me know SHA of edk2 tested, so that I can test it against that SHA and push it. If so, Reviewed-by: Supreeth Venkatesh -Original Message- From: Lokesh B V Sent: Tuesday, November 20, 2018 12:50 AM To: edk2-devel@lists.01.org; Supreeth Venkatesh ; eric@intel.com Cc: Lokesh Belathur Veerappa Subject: [edk2-test][PATCH] Framework/Include: allow usage with EFI version 2.7 EDK2 supports EFI version 2.7 and so allow UEFI-SCT to be usable with this version of EFI. Signed-off-by: Lokesh B V --- uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Include/SctDef.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Include/SctDef.h b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Include/SctDef.h index d24c201..c861437 100644 --- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Include/SctDef.h +++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Include/SctDef.h @@ -46,6 +46,8 @@ Abstract: #define EFI_SCT_NAMEL"UEFI2.5 Self Certification Test(SCT2)" #elif (EFI_SPECIFICATION_VERSION == EFI_2_60_SYSTEM_TABLE_REVISION) #define EFI_SCT_NAMEL"UEFI2.6 Self Certification Test(SCT2)" +#elif (EFI_SPECIFICATION_VERSION == EFI_2_70_SYSTEM_TABLE_REVISION) +#define EFI_SCT_NAMEL"UEFI2.7 Self Certification Test(SCT2)" #else #error Unknown EFI_SPECIFICATION_VERSION #endif -- 2.7.4 IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you. ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you. ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [edk2-test][PATCH] SctPkg/Tools: Fix incorrect line ending detection by GenBin tool
Hi Supreeth,
The 'GenBin' tool has to be rebuilt with this change. The GenBin tool build
support is added in the patch "[edk2-test][PATCH] SctPkg/build: Add support for
GenBin tool build".
I will upload a single patch which includes both the changes. Please verify and
merge it.
Thanks,
Lokesh
-Original Message-
From: Supreeth Venkatesh
Sent: Tuesday, November 27, 2018 1:56 AM
To: Lokesh Belathur Veerappa ; edk2-devel@lists.01.org;
eric@intel.com
Cc: Lokesh Belathur Veerappa
Subject: RE: [edk2-test][PATCH] SctPkg/Tools: Fix incorrect line ending
detection by GenBin tool
With the latest edk2, I am getting this compilation error (even when this patch
is applied).
I will be looking at it tomorrow. Please check this out if you get a chance.
GenBin
/data/users/supreeth/supven01/work/sct_workspace/edk2/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/UncompressedFile2/UncompressedFile2.ini
/data/users/supreeth/supven01/work/sct_workspace/edk2/Build/UefiSct/DEBUG_GCC49/AARCH64/Decompress_UncompressedFile2.ucmp
Error: Invalid format (Line 30)
Error: Cannot generate the binary file
GNUmakefile:232: recipe for target
'/data/users/supreeth/supven01/work/sct_workspace/edk2/Build/UefiSct/DEBUG_GCC49/AARCH64/Decompress_UncompressedFile2.ucmp'
failed
make: ***
[/data/users/supreeth/supven01/work/sct_workspace/edk2/Build/UefiSct/DEBUG_GCC49/AARCH64/Decompress_UncompressedFile2.ucmp]
Error 255
build.py...
: error 7000: Failed to execute command
make tbuild
[/data/users/supreeth/supven01/work/sct_workspace/edk2/Build/UefiSct/DEBUG_GCC49/AARCH64/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/UncompressedFile2/UncompressedFile2]
Thanks,
Supreeth
-Original Message-
From: Lokesh B V
Sent: Tuesday, November 20, 2018 12:50 AM
To: edk2-devel@lists.01.org; Supreeth Venkatesh ;
eric@intel.com
Cc: Lokesh Belathur Veerappa
Subject: [edk2-test][PATCH] SctPkg/Tools: Fix incorrect line ending detection
by GenBin tool
Some windows editors uses "\r\n" for line feed. While processing uefi testcase
info file, the GenBin tool logic to skip line feed doesn't consider the
presence of carraige return(\r) in line feed. So this results in incorrect
format error.
Signed-off-by: Lokesh B V
---
uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
b/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
index 61bb35b..ce271a1 100644
--- a/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
+++ b/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
@@ -176,6 +176,7 @@ Trim (
for (Index1 = 0; Index1 < Length; Index1++) {
if ((String[Index1] != ' ' ) &&
(String[Index1] != '\t') &&
+(String[Index1] != '\r') &&
(String[Index1] != '\n')) {
break;
}
@@ -193,6 +194,7 @@ Trim (
for (Index1 = 0; Index1 < Length; Index1++) {
if ((String[Length - 1 - Index1] != ' ' ) &&
(String[Length - 1 - Index1] != '\t') &&
+(String[Length - 1 - Index1] != '\r') &&
(String[Length - 1 - Index1] != '\n')) {
break;
}
--
2.7.4
IMPORTANT NOTICE: The contents of this email and any attachments are
confidential and may also be privileged. If you are not the intended recipient,
please notify the sender immediately and do not disclose the contents to any
other person, use it for any purpose, or store or copy the information in any
medium. Thank you.
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [edk2-test][PATCH] SctPkg/build: Add support for GenBin tool build
Hello Eric/Supreeth, Could you please review this patch. Thanks, Lokesh -Original Message- From: Lokesh B V Sent: Tuesday, November 20, 2018 12:21 PM To: edk2-devel@lists.01.org; Supreeth Venkatesh ; eric@intel.com Cc: Lokesh Belathur Veerappa Subject: [edk2-test][PATCH] SctPkg/build: Add support for GenBin tool build As the GenBin tool is necessary for SCT build, it is appropriate to support it's build in the SCT build procedure. Signed-off-by: Lokesh B V --- uefi-sct/SctPkg/build.sh | 29 + 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/uefi-sct/SctPkg/build.sh b/uefi-sct/SctPkg/build.sh index 73581c9..e070ad5 100755 --- a/uefi-sct/SctPkg/build.sh +++ b/uefi-sct/SctPkg/build.sh @@ -228,21 +228,26 @@ else echo using prebuilt tools fi -# Copy GenBin file to Base tools directory +if [[ ! -e $EDK_TOOLS_PATH/Source/C/bin/GenBin ]] then + # build the GenBin if it doesn't yet exist + echo Building GenBin + make -C $EDK_TOOLS_PATH/../SctPkg/Tools/Source/GenBin + status=$? + if test $status -ne 0 + then + echo Error while building GenBin +exit -1 + fi +else + echo using prebuilt GenBin +fi + +# Copy GenBin file to Base tools bin directory DEST_DIR=`GetEdkToolsPathBinDirectory` # Ensure the directory exist mkdir -p $DEST_DIR -case `uname -m` in -x86_64) -cp SctPkg/Tools/Bin/GenBin_lin_64 $DEST_DIR/GenBin -;; -x86_32) -cp SctPkg/Tools/Bin/GenBin_lin_32 $DEST_DIR/GenBin -;; -*) -cp SctPkg/Tools/Bin/GenBin_lin_32 $DEST_DIR/GenBin -;; -esac +cp $EDK_TOOLS_PATH/Source/C/bin/GenBin $DEST_DIR/GenBin # # Build the SCT package -- 2.7.4 IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you. ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [edk2-test][PATCH] Framework/Include: allow usage with EFI version 2.7
Hi Supreeth, Yes it has been compiled and tested against edk2 with SHA da2c81ee96eba5d5c8ef91fd870ac98d3cf72beb. -Original Message- From: Supreeth Venkatesh Sent: Tuesday, November 20, 2018 8:34 PM To: Lokesh Belathur Veerappa ; edk2-devel@lists.01.org; eric@intel.com Cc: Lokesh Belathur Veerappa Subject: RE: [edk2-test][PATCH] Framework/Include: allow usage with EFI version 2.7 Thanks Lokesh for the patch. Has this been compiled and sanity tested against latest edk2? Let me know SHA of edk2 tested, so that I can test it against that SHA and push it. If so, Reviewed-by: Supreeth Venkatesh -Original Message- From: Lokesh B V Sent: Tuesday, November 20, 2018 12:50 AM To: edk2-devel@lists.01.org; Supreeth Venkatesh ; eric@intel.com Cc: Lokesh Belathur Veerappa Subject: [edk2-test][PATCH] Framework/Include: allow usage with EFI version 2.7 EDK2 supports EFI version 2.7 and so allow UEFI-SCT to be usable with this version of EFI. Signed-off-by: Lokesh B V --- uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Include/SctDef.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Include/SctDef.h b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Include/SctDef.h index d24c201..c861437 100644 --- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Include/SctDef.h +++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Include/SctDef.h @@ -46,6 +46,8 @@ Abstract: #define EFI_SCT_NAMEL"UEFI2.5 Self Certification Test(SCT2)" #elif (EFI_SPECIFICATION_VERSION == EFI_2_60_SYSTEM_TABLE_REVISION) #define EFI_SCT_NAMEL"UEFI2.6 Self Certification Test(SCT2)" +#elif (EFI_SPECIFICATION_VERSION == EFI_2_70_SYSTEM_TABLE_REVISION) +#define EFI_SCT_NAMEL"UEFI2.7 Self Certification Test(SCT2)" #else #error Unknown EFI_SPECIFICATION_VERSION #endif -- 2.7.4 IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you. ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
