From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=217.140.101.70; helo=foss.arm.com; envelope-from=lokesh.bv@arm.com; receiver=edk2-devel@lists.01.org Received: from foss.arm.com (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by ml01.01.org (Postfix) with ESMTP id B049621A07A82 for ; Tue, 27 Nov 2018 02:29:49 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7F12F3563; Tue, 27 Nov 2018 02:29:49 -0800 (PST) Received: from usa.arm.com (a075554-lin.blr.arm.com [10.162.0.156]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 6CE3B3F575; Tue, 27 Nov 2018 02:29:48 -0800 (PST) From: Lokesh B V To: edk2-devel@lists.01.org Date: Tue, 27 Nov 2018 15:59:43 +0530 Message-Id: <1543314583-23832-1-git-send-email-lokesh.bv@arm.com> X-Mailer: git-send-email 2.7.4 Subject: [edk2-test][PATCH v3] SctPkg/build: Add support for GenBin tool build 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 10:29:49 -0000 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 carriage return(\r) in line feed. So this results in incorrect format error. 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 -- 2.7.4