From patchwork Wed May 24 17:46:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 9746637 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 0CD066032B for ; Wed, 24 May 2017 17:47:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F2D3F288AA for ; Wed, 24 May 2017 17:47:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E769F289AD; Wed, 24 May 2017 17:47:00 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 73C62289C9 for ; Wed, 24 May 2017 17:47:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754307AbdEXRq6 (ORCPT ); Wed, 24 May 2017 13:46:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38828 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754200AbdEXRq5 (ORCPT ); Wed, 24 May 2017 13:46:57 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9C193883B1 for ; Wed, 24 May 2017 17:46:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 9C193883B1 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=drjones@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 9C193883B1 Received: from kamzik.brq.redhat.com (kamzik.brq.redhat.com [10.34.1.143]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C1FA7F486; Wed, 24 May 2017 17:46:55 +0000 (UTC) From: Andrew Jones To: kvm@vger.kernel.org Cc: pbonzini@redhat.com, rkrcmar@redhat.com, lvivier@redhat.com, thuth@redhat.com Subject: [PATCH kvm-unit-tests 9/8] mkstandalone: provide errata to tests Date: Wed, 24 May 2017 19:46:53 +0200 Message-Id: <20170524174653.6017-1-drjones@redhat.com> In-Reply-To: <20170524160818.4326-1-drjones@redhat.com> References: <20170524160818.4326-1-drjones@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 24 May 2017 17:46:56 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Andrew Jones --- configure | 1 + scripts/arch-run.bash | 4 ++-- scripts/mkstandalone.sh | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/configure b/configure index cde2cfe9db61..e1efb3ca0cca 100755 --- a/configure +++ b/configure @@ -194,5 +194,6 @@ FIRMWARE=$firmware ENDIAN=$endian PRETTY_PRINT_STACKS=$pretty_print_stacks ENVIRON_DEFAULT=$environ_default +ERRATATXT=errata.txt U32_LONG_FMT=$u32_long EOF diff --git a/scripts/arch-run.bash b/scripts/arch-run.bash index d35a176ef210..a0ff459eebbb 100644 --- a/scripts/arch-run.bash +++ b/scripts/arch-run.bash @@ -194,9 +194,9 @@ env_generate_errata () local line commit minver errata v p s have [ "$ENVIRON_DEFAULT" != "yes" ] && return - [ ! -f errata.txt ] && return + [ ! -f "$ERRATATXT" ] && return - for line in $(grep -v '^#' errata.txt | tr -d '[:blank:]' | cut -d: -f1,2); do + for line in $(grep -v '^#' "$ERRATATXT" | tr -d '[:blank:]' | cut -d: -f1,2); do commit=$(echo $line | cut -d: -f1) minver=$(echo $line | cut -d: -f2) diff --git a/scripts/mkstandalone.sh b/scripts/mkstandalone.sh index 55cfc4ef8c00..a15941f75375 100755 --- a/scripts/mkstandalone.sh +++ b/scripts/mkstandalone.sh @@ -40,6 +40,7 @@ generate_test () echo "#!/usr/bin/env bash" echo "export STANDALONE=yes" + echo "export ENVIRON_DEFAULT=yes" echo "export HOST=\$(uname -m | sed -e 's/i.86/i386/;s/arm.*/arm/;s/ppc64.*/ppc64/')" echo "export PRETTY_PRINT_STACKS=no" @@ -62,6 +63,11 @@ generate_test () echo 'export FIRMWARE' fi + if [ "$ERRATATXT" ]; then + temp_file ERRATATXT "$ERRATATXT" + echo 'export ERRATATXT' + fi + temp_file bin "$kernel" args[3]='$bin'