From patchwork Wed Apr 18 22:03:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Shier X-Patchwork-Id: 10348929 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DB37D6031B for ; Wed, 18 Apr 2018 22:04:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C98DF288D0 for ; Wed, 18 Apr 2018 22:04:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BDA55288D3; Wed, 18 Apr 2018 22:04:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B932288D0 for ; Wed, 18 Apr 2018 22:04:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752308AbeDRWEH (ORCPT ); Wed, 18 Apr 2018 18:04:07 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:35420 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750981AbeDRWEG (ORCPT ); Wed, 18 Apr 2018 18:04:06 -0400 Received: by mail-pg0-f67.google.com with SMTP id j11so1500037pgf.2 for ; Wed, 18 Apr 2018 15:04:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=mLl30bH+ZI1IxYmC7mefPgnSKVHtuyoafXZMFO7B0pk=; b=EGrW66O14w8W2u7pMR4nN6XpM7fD/6zR3l7AkouyrKEVBSuw86wa0tK0rlZPzk7y8u XlIfS4lOglkzeNpdpwAWHxXjfbsNClQ9o2teuYnAffAhhaYdoY3zLDzmUNX76RgIAP8n iLk1IioKmAmQQ67HUQfoGIIiUr1k+F+z51Ge1sXV5zSFfqWptfq0HMM2/FVEsbLdp4km te7IrpFAD39RpH+O/0ZgY6nlZh4VleLvLA0uUpxYk0ddgolfZtq9X5Yq0G6Tv/rNVSiP sqaODzl14ek9+UhcZR7PwZADDycyGQmUTrv0+3obKty2TBijtOuo1D8XYkCAU7rySEh8 TqMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=mLl30bH+ZI1IxYmC7mefPgnSKVHtuyoafXZMFO7B0pk=; b=fdjkNFVoEMMs4R0G/Po+PwHQ9fWwjOj7AKP93i5KV/pNquhdNsWYXgNeXvuZ8BeyrB gvT2eXIwT52MZOeTmmIHOiC/oHfehVITDqu6u8nivE57EDNeReOn2rfE+Q/GEnZerTOS ySJBULM9MEfFouwoUfpUKQyciDAucyj9zBAa1gDHQ5bb/GAEihmJ1iNKrmJWNYXMOURN Kjyde4srNM4cbpoPMnZOPeNH12tB4YVy1if7zS14JsF/aB3Z6y9xa2nm3irQzPNrVF2f J9VicCm0CZIKZOiwCTEoRcE76p4OShWW6k7ASCt3w4FBOZ76PaJOjCNG7zq+96/NEJgc e7vg== X-Gm-Message-State: ALQs6tCsmUrOm2QIngYpKVlNvbV5xNR6Vh1tmnooEDfUrq5V2GME21k6 uQm+jlQhBa9zOSjlfPB9BVyMa9chad4= X-Google-Smtp-Source: AIpwx4/oNLLrcdm0Zw+DfRqcWoygvQPGT0Jyid7us6blRVsRLBzCAPCtgHgZ2J9hkWtrOHX0N+xTpw== X-Received: by 10.101.77.67 with SMTP id j3mr3072886pgt.210.1524089045358; Wed, 18 Apr 2018 15:04:05 -0700 (PDT) Received: from pshier-linuxworkstation.sea.corp.google.com ([2620:0:1009:11:b6d3:ead8:6161:6050]) by smtp.gmail.com with ESMTPSA id r20sm5781758pff.165.2018.04.18.15.04.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Apr 2018 15:04:04 -0700 (PDT) From: Peter Shier To: kvm@vger.kernel.org Cc: Peter Shier Subject: [kvm-unit-tests PATCH] Make scripts/arch-run.bash compatible with Bash 4.1 and older Date: Wed, 18 Apr 2018 15:03:35 -0700 Message-Id: <20180418220335.100755-1-pshier@google.com> X-Mailer: git-send-email 2.17.0.484.g0c8726318c-goog Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP KVM unit tests scripts/arch-run.bash uses test -v to check whether a variable was set. The -v switch was introduced in Bash 4.2. This patch uses the older test -z to test for an empty string. test -v was used on a variable that is set on the prior line so it would never be empty or considered unset. This patch moves the test earlier to check whether there is a SHA in the errata file. This patch also adds double quotes around source strings for read commands. On older Bash versions, without the quotes the read will parse the string into its components but then place them all into a single variable separated by spaces rather than into separate variables as the script intends. Tested: Ran with an injected empty string in errata.txt to verify with git://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git at 073ea627a4268333e0e2245382ecf5fabc28f594. Signed-off-by: Peter Shier --- scripts/arch-run.bash | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/arch-run.bash b/scripts/arch-run.bash index e13af8e8064a..f0a9b1d7c53c 100644 --- a/scripts/arch-run.bash +++ b/scripts/arch-run.bash @@ -234,8 +234,8 @@ env_generate_errata () local kernel_version kernel_patchlevel kernel_sublevel kernel_extraversion local line commit minver errata rest v p s x have - IFS=. read -r kernel_version kernel_patchlevel rest <<<$kernel_version_string - IFS=- read -r kernel_sublevel kernel_extraversion <<<$rest + IFS=. read -r kernel_version kernel_patchlevel rest <<<"$kernel_version_string" + IFS=- read -r kernel_sublevel kernel_extraversion <<<"$rest" kernel_sublevel=${kernel_sublevel%%[!0-9]*} kernel_extraversion=${kernel_extraversion%%[!0-9]*} @@ -249,8 +249,8 @@ env_generate_errata () commit=${line%:*} minver=${line#*:} + test -z "$commit" && continue errata="ERRATA_$commit" - test -v $errata && continue IFS=. read -r v p rest <<<"$minver" IFS=- read -r s x <<<"$rest"