From patchwork Fri Jan 22 15:55:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12039857 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 586FFC4332B for ; Fri, 22 Jan 2021 15:56:28 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1D56E233FC for ; Fri, 22 Jan 2021 15:56:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1D56E233FC Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=xenproject.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.72897.131381 (Exim 4.92) (envelope-from ) id 1l2ynF-0004bV-Te; Fri, 22 Jan 2021 15:56:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72897.131381; Fri, 22 Jan 2021 15:56:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2ynF-0004bO-QQ; Fri, 22 Jan 2021 15:56:13 +0000 Received: by outflank-mailman (input) for mailman id 72897; Fri, 22 Jan 2021 15:56:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2ynE-0004at-HF for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2ynE-0002OJ-DH for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:12 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1l2ynE-0000R1-CF for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:12 +0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by mariner.uk.xensource.com with esmtp (Exim 4.89) (envelope-from ) id 1l2ynC-0004Ar-FM; Fri, 22 Jan 2021 15:56:10 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version: Message-Id:Date:Subject:Cc:To:From; bh=uruu1brBPF9CVtq5ECLiA2WZSJ/C5nDctUOD+ZVBmXU=; b=Duuglm/o8nqen2vKVN1Ni6L2aU wEW0ekrTR/+HNo26L0mLodfx3ucdIJAc3NhDZib25DBFG0rbKS0uf2hmRNV9IravzSO8yca7Eg7Wz F9Ch+jxTL+T5uXcB3Ri4KwLZNoEXkTbPX6phA/gmarx/W1PmpZ3rbs+Wt35sl69E5qHQ=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 1/7] target_editfile_kvp_replace: Support changing multiple keys Date: Fri, 22 Jan 2021 15:55:57 +0000 Message-Id: <20210122155603.23402-1-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 No functional change with existing callers. Signed-off-by: Ian Jackson --- Osstest/TestSupport.pm | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index 9362a865..d2558f31 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -769,25 +769,32 @@ sub teditfileex { if $install; } -# Replace a Key=Value style line in a config file. +# Replace Key=Value style line(s) in a config file. # # To be used as 3rd argument to target_editfile(_root) as: # target_editfile_root($ho, "/path/to/a/file", # sub { target_editfile_kvp_replace($key, $value) }); -sub target_editfile_kvp_replace ($$) +sub target_editfile_kvp_replace { - my ($key,$value) = @_; - my $prnow; - $prnow= sub { + my (%kv) = @_; + my $prnow= sub { + my ($key) = @_; + my $value = $kv{$key}; + return unless defined $value; print ::EO "$key=$value\n" or die $!; - $prnow= sub { }; + delete $kv{$key}; }; while (<::EI>) { - print ::EO or die $! unless m/^$key\b/; - $prnow->() if m/^#$key/; + if (m/^\S+\b/ && exists $kv{$&}) { + $prnow->($&); + } else { + print ::EO or die $!; + } } print ::EO "\n" or die $!; - $prnow->(); + foreach my $key (sort keys %kv) { + $prnow->($key); + } }; sub target_editfile_root ($$$;$$) { teditfileex('root',@_); }