From patchwork Tue Jan 19 13:24:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= X-Patchwork-Id: 8062021 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 089F4BEEE5 for ; Tue, 19 Jan 2016 13:25:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2D6C520397 for ; Tue, 19 Jan 2016 13:25:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4A9F32010B for ; Tue, 19 Jan 2016 13:25:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932187AbcASNZF (ORCPT ); Tue, 19 Jan 2016 08:25:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41546 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754846AbcASNY5 (ORCPT ); Tue, 19 Jan 2016 08:24:57 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id D18668F4FB for ; Tue, 19 Jan 2016 13:24:57 +0000 (UTC) Received: from potion ([10.34.1.163]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id u0JDOtVY011428; Tue, 19 Jan 2016 08:24:55 -0500 Received: by potion (sSMTP sendmail emulation); Tue, 19 Jan 2016 14:24:55 +0100 From: =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= To: kvm@vger.kernel.org Cc: Paolo Bonzini , Andrew Jones Subject: [PATCH kvm-unit-tests 11/12] scripts/mkstandalone: sanitize one_kernel handling Date: Tue, 19 Jan 2016 14:24:10 +0100 Message-Id: <1453209851-27760-12-git-send-email-rkrcmar@redhat.com> In-Reply-To: <1453209851-27760-1-git-send-email-rkrcmar@redhat.com> References: <1453209851-27760-1-git-send-email-rkrcmar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Radim Kr?má? --- scripts/mkstandalone.sh | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/scripts/mkstandalone.sh b/scripts/mkstandalone.sh index 6ced8e5970ef..764c42d12e3b 100755 --- a/scripts/mkstandalone.sh +++ b/scripts/mkstandalone.sh @@ -7,19 +7,6 @@ fi source config.mak source scripts/functions.bash -one_kernel="$1" -[ "$one_kernel" ] && one_kernel_base=$(basename $one_kernel) -one_testname="$2" -if [ -n "$one_kernel" ] && [ ! -f $one_kernel ]; then - echo "$one_kernel doesn't exist" - exit 1 -elif [ -n "$one_kernel" ] && [ -z "$one_testname" ]; then - one_testname="${one_kernel_base%.*}" -fi - -unittests=$TEST_DIR/unittests.cfg -mkdir -p tests - escape () { for arg in "${@}"; do @@ -90,11 +77,21 @@ function mkstandalone() return 0 } -trap 'rm -f $cfg; exit 1' HUP INT TERM trap 'rm -f $cfg' EXIT cfg=$(mktemp) -if [ -n "$one_testname" ]; then +unittests=$TEST_DIR/unittests.cfg +one_kernel="$1" + +if [ "$one_kernel" ]; then + [ ! -f $one_kernel ] && { + echo "$one_kernel doesn't exist" + exit 1 + } + + one_kernel_base=$(basename $one_kernel) + one_testname="${2:-${one_kernel_base%.*}}" + if grep -q "\[$one_testname\]" $unittests; then sed -n "/\\[$one_testname\\]/,/^\\[/p" $unittests \ | awk '!/^\[/ || NR == 1' > $cfg @@ -106,4 +103,6 @@ else cp -f $unittests $cfg fi +mkdir -p tests + for_each_unittest $cfg mkstandalone