From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=40.107.8.81; helo=eur04-vi1-obe.outbound.protection.outlook.com; envelope-from=lokesh.bv@arm.com; receiver=edk2-devel@lists.01.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80081.outbound.protection.outlook.com [40.107.8.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id EC5672119175F for ; Tue, 27 Nov 2018 08:51:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector1-arm-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+VETSutibeMVYhh7NfPihhH5+RLW2TSaUX2xtmdo510=; b=o4QBJQcAE+gcA+SrhotAZ5IYE98CxHnImSkSfWpZIV+q4RjF4WdXrWeh2w+sBrHnoukJg4sJOyo9sB04Sw/A8B+23SdgdGvxkx0KA18J6O25IYMB4/HrMi5i/abgY8gwT+K+MurXU7ggWwGWZ3Bgy2biOPUiPu2r9fXVQuPDFFM= Received: from VI1PR0802MB2334.eurprd08.prod.outlook.com (10.172.14.9) by VI1PR0802MB2301.eurprd08.prod.outlook.com (10.172.13.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1361.19; Tue, 27 Nov 2018 16:51:26 +0000 Received: from VI1PR0802MB2334.eurprd08.prod.outlook.com ([fe80::5420:4872:5b1f:6b5f]) by VI1PR0802MB2334.eurprd08.prod.outlook.com ([fe80::5420:4872:5b1f:6b5f%4]) with mapi id 15.20.1361.019; Tue, 27 Nov 2018 16:51:25 +0000 From: Lokesh Belathur Veerappa To: Supreeth Venkatesh CC: "eric.jin@intel.com" , "edk2-devel@lists.01.org" Thread-Topic: [edk2-test][PATCH] SctPkg/Tools: Fix incorrect line ending detection by GenBin tool Thread-Index: AQHUgJ1R9u7APhthKkC9p+Evt5f+EKVii02AgACqfkCAAIZigIAAJGHw Date: Tue, 27 Nov 2018 16:51:25 +0000 Message-ID: References: <1542696618-2284-1-git-send-email-lokesh.bv@arm.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Lokesh.BV@arm.com; x-originating-ip: [106.51.17.227] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR0802MB2301; 6:6ScKMDRpldUm36e7Lm3DKUcMNYDvuewu1Z7QsxjbSmZfone3TYnJE1uYb5vZF6q7tdRoFqmZjWhGL65t6OL3cUaqnLFWYJNMnRipX5zTrUczEsjCqcDOAiwfu/nNhPmjt4zv316QNYyDrO4KrKUjMkfDxEfXCMROmfrW6taaFwQenATrQsJ0fgBkbbjJrWYSdzbjALRuuW/EAFb7gnJByLkouSkJuhvndQn5w8mihKGq9P8zR8IDlCGOkNTnQK31UvysNYAhehmqYqupJLO2bg0436upNJJ7TD7E90/UWMnPZjhge1nMKXaQhgaO4+hKYiYAip27SFV5yPbAwxlAbu7wWdp8JlqUS4T/EPSjQTWMmBojzkONS33iGbdJ9o8zS+S0yhhxPQd2yzftPNQD/KYJ+rUXSlYQxgB4Y03saTznJb5xB3PeXtKd5qi0U981v2xVvusjMxjGXpRRd3CY0w==; 5:dQrrr+BR6lhgk84a6+fQVwxkKZGKlX4HQhWYKfQxjj9gRYhV+8JO4iWxjRPRxLunVVX0yRW55pyVhFv6xN340J+wdwrQt+qT8lLvFXnWeEO3h5EAK+MUuq/a6gztX7q04Nm5fAnEK0Wicloc4n/HpsYG2Q/d6hFJzxwQZyhSXJA=; 7:DxOEyrPDw8oilrzmFKQ7kr+bsvrFhHwu0mfoyobrDD7xpm9oePdAPnlnR2eVUfPlATFoTeGhIusbJZUbjwkqcrQezD5GAShYf17Aumeg2AsLsOdJ2QQStfBqUKMji5qUGfOHve8jstvsnwCItmQ3Ww== x-ms-exchange-antispam-srfa-diagnostics: SOS;SOR; x-ms-office365-filtering-correlation-id: c890dbaf-be38-4bed-703e-08d6548891db x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:VI1PR0802MB2301; x-ms-traffictypediagnostic: VI1PR0802MB2301: x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(3231443)(944501410)(52105112)(6055026)(148016)(149066)(150057)(6041310)(20161123562045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(201708071742011)(7699051)(76991095); SRVR:VI1PR0802MB2301; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0802MB2301; x-forefront-prvs: 086943A159 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(136003)(396003)(346002)(366004)(376002)(13464003)(189003)(199004)(40434004)(305945005)(54906003)(8676002)(106356001)(105586002)(7736002)(86362001)(93886005)(229853002)(6636002)(316002)(14444005)(486006)(53936002)(9456002)(71190400001)(256004)(5024004)(71200400001)(78486014)(446003)(11346002)(476003)(8936002)(9686003)(55016002)(81156014)(5660300001)(74316002)(81166006)(66066001)(14454004)(68736007)(4326008)(55236004)(25786009)(33656002)(26005)(186003)(6862004)(72206003)(6116002)(3846002)(2906002)(478600001)(53546011)(6506007)(6246003)(6436002)(76176011)(99286004)(102836004)(7696005)(97736004); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0802MB2301; H:VI1PR0802MB2334.eurprd08.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: arm.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: kfhW21oFcA8AEYRvFw7tCrr9vZlputGZJGa7tte3kUjKQmnDRM8qPKNKiZv9IIjTHrcp+zaH1FIwo2UhxkXeayi8OvAfRbE+LaYotAzcP2accl0VOJKQWha9xlJvViJ0FXqzLTbvcX5qHymnXSOkxj+xplQADHTGy4pr0mQgPHGwzAPDn4HN51SUia3Zmw3p8ZBOyUY1KMZBrippDTHgW/qdXtyZwDMD15GaedmzOsDUxhvb9FEh0G/yd0LsZcklfVnWueTZ/FFPUs/8oCDzwOrkMhsHYs26UDPvxuFc5LEPL8G1kxDT5okHxJk9RcpQsNkX89AqHTKcotJItxHG1TUuikAIOFR5RUJR+EorqtE= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-Network-Message-Id: c890dbaf-be38-4bed-703e-08d6548891db X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Nov 2018 16:51:25.7275 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0802MB2301 Subject: Re: [edk2-test][PATCH] SctPkg/Tools: Fix incorrect line ending detection by GenBin tool X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Nov 2018 16:51:30 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Supreeth, The GenBin tool was not being rebuilt due to the existence of previously bu= ilt intermediate binary. To resolve this, intermediate binary has to be cle= aned 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.jin@intel.com; edk2-devel@lists.01.org Subject: RE: [edk2-test][PATCH] SctPkg/Tools: Fix incorrect line ending det= ection 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.or= g; eric.jin@intel.com Subject: RE: [edk2-test][PATCH] SctPkg/Tools: Fix incorrect line ending det= ection by GenBin tool Hi Supreeth, The 'GenBin' tool has to be rebuilt with this change. The GenBin tool buil= d support is added in the patch "[edk2-test][PATCH] SctPkg/build: Add suppo= rt 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.jin@intel.com Cc: Lokesh Belathur Veerappa Subject: RE: [edk2-test][PATCH] SctPkg/Tools: Fix incorrect line ending det= ection by GenBin tool With the latest edk2, I am getting this compilation error (even when this p= atch 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/TestCa= se/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/UncompressedFile2/U= ncompressedFile2.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_UncompressedFil= e2.ucmp' failed make: *** [/data/users/supreeth/supven01/work/sct_workspace/edk2/Build/Uefi= Sct/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/Ue= fiSct/DEBUG_GCC49/AARCH64/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/Blac= kBoxTest/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.jin@intel.com Cc: Lokesh Belathur Veerappa Subject: [edk2-test][PATCH] SctPkg/Tools: Fix incorrect line ending detecti= on by GenBin tool Some windows editors uses "\r\n" for line feed. While processing uefi testc= ase 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 =3D 0; Index1 < Length; Index1++) { if ((String[Index1] !=3D ' ' ) && (String[Index1] !=3D '\t') && + (String[Index1] !=3D '\r') && (String[Index1] !=3D '\n')) { break; } @@ -193,6 +194,7 @@ Trim ( for (Index1 =3D 0; Index1 < Length; Index1++) { if ((String[Length - 1 - Index1] !=3D ' ' ) && (String[Length - 1 - Index1] !=3D '\t') && + (String[Length - 1 - Index1] !=3D '\r') && (String[Length - 1 - Index1] !=3D '\n')) { break; } -- 2.7.4 IMPORTANT NOTICE: The contents of this email and any attachments are confid= ential and may also be privileged. If you are not the intended recipient, p= lease 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.