[edk2-test][PATCH] SctPkg/Tools: Fix incorrect line ending detection by GenBin tool

[edk2-test][PATCH] SctPkg/Tools: Fix incorrect line ending detection by GenBin tool

[Lokesh B V]

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 <lokesh.bv@arm.com>
---
 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

Re: [edk2-test][PATCH] SctPkg/Tools: Fix incorrect line ending detection by GenBin tool

[Jin, Eric]

Please don't forget to change the copyright info when commit patch.
Reviewed-by: Eric Jin <eric.jin@intel.com>

-----Original Message-----
From: Lokesh B V <lokesh.bv@arm.com> 
Sent: Tuesday, November 20, 2018 2:50 PM
To: edk2-devel@lists.01.org; supreeth.venkatesh@arm.com; Jin, Eric <eric.jin@intel.com>
Cc: Lokesh B V <lokesh.bv@arm.com>
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 <lokesh.bv@arm.com>
---
 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

Re: [edk2-test][PATCH] SctPkg/Tools: Fix incorrect line ending detection by GenBin tool

[Supreeth Venkatesh]

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 <lokesh.bv@arm.com>
Sent: Tuesday, November 20, 2018 12:50 AM
To: edk2-devel@lists.01.org; Supreeth Venkatesh <Supreeth.Venkatesh@arm.com>; eric.jin@intel.com
Cc: Lokesh Belathur Veerappa <Lokesh.BV@arm.com>
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 <lokesh.bv@arm.com>
---
 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.

Re: [edk2-test][PATCH] SctPkg/Tools: Fix incorrect line ending detection by GenBin tool

[Lokesh Belathur Veerappa]

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 <Supreeth.Venkatesh@arm.com>
Sent: Tuesday, November 27, 2018 1:56 AM
To: Lokesh Belathur Veerappa <Lokesh.BV@arm.com>; edk2-devel@lists.01.org; eric.jin@intel.com
Cc: Lokesh Belathur Veerappa <Lokesh.BV@arm.com>
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 <lokesh.bv@arm.com>
Sent: Tuesday, November 20, 2018 12:50 AM
To: edk2-devel@lists.01.org; Supreeth Venkatesh <Supreeth.Venkatesh@arm.com>; eric.jin@intel.com
Cc: Lokesh Belathur Veerappa <Lokesh.BV@arm.com>
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 <lokesh.bv@arm.com>
---
 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.

Re: [edk2-test][PATCH] SctPkg/Tools: Fix incorrect line ending detection by GenBin tool

[Supreeth Venkatesh]

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 <Lokesh.BV@arm.com>
Sent: Tuesday, November 27, 2018 2:04 AM
To: Supreeth Venkatesh <Supreeth.Venkatesh@arm.com>; edk2-devel@lists.01.org; eric.jin@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 <Supreeth.Venkatesh@arm.com>
Sent: Tuesday, November 27, 2018 1:56 AM
To: Lokesh Belathur Veerappa <Lokesh.BV@arm.com>; edk2-devel@lists.01.org; eric.jin@intel.com
Cc: Lokesh Belathur Veerappa <Lokesh.BV@arm.com>
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 <lokesh.bv@arm.com>
Sent: Tuesday, November 20, 2018 12:50 AM
To: edk2-devel@lists.01.org; Supreeth Venkatesh <Supreeth.Venkatesh@arm.com>; eric.jin@intel.com
Cc: Lokesh Belathur Veerappa <Lokesh.BV@arm.com>
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 <lokesh.bv@arm.com>
---
 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.

Re: [edk2-test][PATCH] SctPkg/Tools: Fix incorrect line ending detection by GenBin tool

[Lokesh Belathur Veerappa]

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 <Supreeth.Venkatesh@arm.com>
Sent: Tuesday, November 27, 2018 8:07 PM
To: Lokesh Belathur Veerappa <Lokesh.BV@arm.com>
Cc: eric.jin@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 <Lokesh.BV@arm.com>
Sent: Tuesday, November 27, 2018 2:04 AM
To: Supreeth Venkatesh <Supreeth.Venkatesh@arm.com>; edk2-devel@lists.01.org; eric.jin@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 <Supreeth.Venkatesh@arm.com>
Sent: Tuesday, November 27, 2018 1:56 AM
To: Lokesh Belathur Veerappa <Lokesh.BV@arm.com>; edk2-devel@lists.01.org; eric.jin@intel.com
Cc: Lokesh Belathur Veerappa <Lokesh.BV@arm.com>
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 <lokesh.bv@arm.com>
Sent: Tuesday, November 20, 2018 12:50 AM
To: edk2-devel@lists.01.org; Supreeth Venkatesh <Supreeth.Venkatesh@arm.com>; eric.jin@intel.com
Cc: Lokesh Belathur Veerappa <Lokesh.BV@arm.com>
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 <lokesh.bv@arm.com>
---
 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.