From patchwork Fri Feb 25 08:58:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Su Lifan X-Patchwork-Id: 51386 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CEC4A3858029 for ; Fri, 25 Feb 2022 08:58:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CEC4A3858029 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1645779515; bh=au1YK2hNepwCQD6dH5Ad1wKQ1UkTk0PZHy8SI4jhmN4=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Hltl7XEb+8w00lRtj7UMdHOK+vgdN/RSVe5QjxxbGK8F5LnaCcl+MANXUsHhTvi0B DKXvOdSWj6BljJZwzH3icL9Yf1BEPvrYh7qItGUuK31fbJo3XNngOu/UY5w4P6ECVf r8IQuOfZOtvMX2C3oI7nM5MqtuG7BrohVMW+hLgg= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from out30-131.freemail.mail.aliyun.com (out30-131.freemail.mail.aliyun.com [115.124.30.131]) by sourceware.org (Postfix) with ESMTPS id 3E9AB3858402 for ; Fri, 25 Feb 2022 08:58:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3E9AB3858402 X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R121e4; CH=green; DM=||false|; DS=||; FP=0|-1|-1|-1|0|-1|-1|-1; HT=e01e04426; MF=su-lifan@linux.alibaba.com; NM=1; PH=DS; RN=1; SR=0; TI=SMTPD_---0V5S9jDL_1645779487; Received: from L-13RSLVDL-1152.local(mailfrom:su-lifan@linux.alibaba.com fp:SMTPD_---0V5S9jDL_1645779487) by smtp.aliyun-inc.com(127.0.0.1); Fri, 25 Feb 2022 16:58:08 +0800 To: libc-alpha@sourceware.org Subject: [PATCH] benchtests: make compare_strings.py accept string as attribute value Message-ID: <3a3f209d-9464-265c-4eb6-13649a53db52@linux.alibaba.com> Date: Fri, 25 Feb 2022 16:58:07 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 X-Spam-Status: No, score=-21.3 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY, USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Su Lifan via Libc-alpha From: Su Lifan Reply-To: Su Lifan Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Commit ac759b1fbf28a82d99afde9046f8b72c7cba5dae added attribute "overlap" to bench-memmove-walk, whose value is a string. This change makes compare_strings.py fail since benchout_strings.schema.json requires the values of attributes to be number. This patch relaxes such constraint. --- benchtests/scripts/benchout_strings.schema.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.32.0 diff --git a/benchtests/scripts/benchout_strings.schema.json b/benchtests/scripts/benchout_strings.schema.json index 7c9a67134b..bfd9b4e6c0 100644 --- a/benchtests/scripts/benchout_strings.schema.json +++ b/benchtests/scripts/benchout_strings.schema.json @@ -28,7 +28,12 @@ "items": {"type": "number"} } }, - "additionalProperties": {"type": "number"}, + "additionalProperties": { + "oneOf": [ + { "type": "number" }, + { "type": "string" } + ] + }, "minProperties": 2 } }