From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2206) id 98FBA385C415; Tue, 8 Mar 2022 14:18:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 98FBA385C415 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Siddhesh Poyarekar To: glibc-cvs@sourceware.org Subject: [glibc] benchtests: make compare_strings.py accept string as attribute value X-Act-Checkin: glibc X-Git-Author: Su Lifan X-Git-Refname: refs/heads/master X-Git-Oldrev: 6de743a4e31a94e3d022e64a90c9082290a5a573 X-Git-Newrev: edddffc9df5ea5882192bca7ddaad8f6440bcc44 Message-Id: <20220308141800.98FBA385C415@sourceware.org> Date: Tue, 8 Mar 2022 14:18:00 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Mar 2022 14:18:00 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=edddffc9df5ea5882192bca7ddaad8f6440bcc44 commit edddffc9df5ea5882192bca7ddaad8f6440bcc44 Author: Su Lifan Date: Fri Feb 25 16:58:07 2022 +0800 benchtests: make compare_strings.py accept string as attribute value 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. Reviewed-by: Siddhesh Poyarekar Diff: --- benchtests/scripts/benchout_strings.schema.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 } }